kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix gofmt

This commit is contained in:
Justin Santa Barbara 2016-12-17 23:18:12 -05:00
parent 362e2cb33e
commit 72ec584033
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
upup/pkg/fi/cloudup/networking.go
View File

@ -64,9 +64,9 @@ func usesCNI(c *api.Cluster) bool {
// https://github.com/kubernetes/kops/issues/626 // https://github.com/kubernetes/kops/issues/626
// https://github.com/kubernetes/kubernetes/issues/30338 // https://github.com/kubernetes/kubernetes/issues/30338
const ( 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" 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) { 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) glog.V(2).Infof("Adding default CNI asset: %s", defaultCNIAsset)
return defaultCNIAsset, defaultCNIAssetHashString return defaultCNIAsset, defaultCNIAssetHashString
} }

8
upup/pkg/fi/cloudup/networking_test.go
View File

@ -17,16 +17,16 @@ limitations under the License.
package cloudup package cloudup
import ( import (
"testing"
api "k8s.io/kops/pkg/apis/kops" api "k8s.io/kops/pkg/apis/kops"
"os" "os"
"testing"
) )
func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) { func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) {
desiredCNIVersion := "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-TEST-VERSION.tar.gz" desiredCNIVersion := "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-TEST-VERSION.tar.gz"
os.Setenv(ENV_VAR_CNI_VERSION_URL, desiredCNIVersion) os.Setenv(ENV_VAR_CNI_VERSION_URL, desiredCNIVersion)
defer func(){ defer func() {
os.Unsetenv(ENV_VAR_CNI_VERSION_URL) os.Unsetenv(ENV_VAR_CNI_VERSION_URL)
}() }()
@ -48,11 +48,11 @@ func Test_FindCNIAssetDefaultValue(t *testing.T) {
cniAsset, cniAssetHashString := findCNIAssets(cluster) cniAsset, cniAssetHashString := findCNIAssets(cluster)
if cniAsset != defaultCNIAsset { 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 { if cniAssetHashString != defaultCNIAssetHashString {
t.Errorf("Expected default CNI Version Hash String %q and got %q", defaultCNIAssetHashString, cniAssetHashString) t.Errorf("Expected default CNI Version Hash String %q and got %q", defaultCNIAssetHashString, cniAssetHashString)
} }
} }