From 72ec58403399bf4b552fccc81b033917e45ec97f Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 17 Dec 2016 23:18:12 -0500 Subject: [PATCH] Fix gofmt --- upup/pkg/fi/cloudup/networking.go | 6 +++--- upup/pkg/fi/cloudup/networking_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/upup/pkg/fi/cloudup/networking.go b/upup/pkg/fi/cloudup/networking.go index 566d57fb55..4d9f72bfd0 100644 --- a/upup/pkg/fi/cloudup/networking.go +++ b/upup/pkg/fi/cloudup/networking.go @@ -64,9 +64,9 @@ func usesCNI(c *api.Cluster) bool { // https://github.com/kubernetes/kops/issues/626 // https://github.com/kubernetes/kubernetes/issues/30338 const ( - defaultCNIAsset = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz" + defaultCNIAsset = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz" defaultCNIAssetHashString = "19d49f7b2b99cd2493d5ae0ace896c64e289ccbb" - ENV_VAR_CNI_VERSION_URL = "CNI_VERSION_URL" + ENV_VAR_CNI_VERSION_URL = "CNI_VERSION_URL" ) func findCNIAssets(c *api.Cluster) (string, string) { @@ -78,4 +78,4 @@ func findCNIAssets(c *api.Cluster) (string, string) { glog.V(2).Infof("Adding default CNI asset: %s", defaultCNIAsset) return defaultCNIAsset, defaultCNIAssetHashString -} \ No newline at end of file +} diff --git a/upup/pkg/fi/cloudup/networking_test.go b/upup/pkg/fi/cloudup/networking_test.go index cbc78187c8..a2e5200e67 100644 --- a/upup/pkg/fi/cloudup/networking_test.go +++ b/upup/pkg/fi/cloudup/networking_test.go @@ -17,16 +17,16 @@ limitations under the License. package cloudup import ( - "testing" api "k8s.io/kops/pkg/apis/kops" "os" + "testing" ) func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) { desiredCNIVersion := "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-TEST-VERSION.tar.gz" os.Setenv(ENV_VAR_CNI_VERSION_URL, desiredCNIVersion) - defer func(){ + defer func() { os.Unsetenv(ENV_VAR_CNI_VERSION_URL) }() @@ -48,11 +48,11 @@ func Test_FindCNIAssetDefaultValue(t *testing.T) { cniAsset, cniAssetHashString := findCNIAssets(cluster) if cniAsset != defaultCNIAsset { - t.Errorf("Expected default CNI version %q and got %q", defaultCNIAsset, cniAsset) + t.Errorf("Expected default CNI version %q and got %q", defaultCNIAsset, cniAsset) } if cniAssetHashString != defaultCNIAssetHashString { t.Errorf("Expected default CNI Version Hash String %q and got %q", defaultCNIAssetHashString, cniAssetHashString) } -} \ No newline at end of file +}