Extract constants to help us replacing KubectlImage/KubectlCommand fr…

…om community ones to official ones once the fix for kubernetes/kubernetes#24088 is pushed to quay
coreos · May 11, 2016 · 3171bd6 · 3171bd6
1 parent ae43f64
commit 3171bd6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/multi-node/aws/pkg/config/config.go b/multi-node/aws/pkg/config/config.go
@@ -23,16 +23,18 @@ import (
 )
 
 const (
-	credentialsDir = "credentials"
-	userDataDir    = "userdata"
+	credentialsDir        = "credentials"
+	userDataDir           = "userdata"
+	defaultKubectlImage   = "mumoshu/kubectl:v1.2.2"
+	defaultKubectlCommand = "kubectl"
 )
 
 func newDefaultCluster() *Cluster {
 	experimental := Experimental{
 		NodeDrainer{
 			Enabled:        false,
-			KubectlImage:   "mumoshu/kubectl:v1.2.2",
-			KubectlCommand: "kubectl",
+			KubectlImage:   defaultKubectlImage,
+			KubectlCommand: defaultKubectlCommand,
 		},
 	}
 

diff --git a/multi-node/aws/pkg/config/config_test.go b/multi-node/aws/pkg/config/config_test.go
@@ -326,8 +326,8 @@ func TestNodeDrainerConfig(t *testing.T) {
 `,
 			nodeDrainer: NodeDrainer{
 				Enabled:        false,
-				KubectlImage:   "mumoshu/kubectl:v1.2.2",
-				KubectlCommand: "kubectl",
+				KubectlImage:   defaultKubectlImage,
+				KubectlCommand: defaultKubectlCommand,
 			},
 		},
 		{
@@ -338,8 +338,8 @@ experimental:
 `,
 			nodeDrainer: NodeDrainer{
 				Enabled:        false,
-				KubectlImage:   "mumoshu/kubectl:v1.2.2",
-				KubectlCommand: "kubectl",
+				KubectlImage:   defaultKubectlImage,
+				KubectlCommand: defaultKubectlCommand,
 			},
 		},
 		{
@@ -350,8 +350,8 @@ experimental:
 `,
 			nodeDrainer: NodeDrainer{
 				Enabled:        true,
-				KubectlImage:   "mumoshu/kubectl:v1.2.2",
-				KubectlCommand: "kubectl",
+				KubectlImage:   defaultKubectlImage,
+				KubectlCommand: defaultKubectlCommand,
 			},
 		},
 		{
@@ -378,8 +378,8 @@ nodeDrainer:
 `,
 			nodeDrainer: NodeDrainer{
 				Enabled:        false,
-				KubectlImage:   "mumoshu/kubectl:v1.2.2",
-				KubectlCommand: "kubectl",
+				KubectlImage:   defaultKubectlImage,
+				KubectlCommand: defaultKubectlCommand,
 			},
 		},
 	}