declare a const instead the string (openyurtio#632)

7lampstand · Nov 26, 2021 · 3b02997 · 3b02997
1 parent 76bd622
commit 3b02997
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/pkg/yurtctl/util/kubernetes/apply_addons.go b/pkg/yurtctl/util/kubernetes/apply_addons.go
@@ -32,7 +32,7 @@ import (
 
 func DeployYurtControllerManager(client *kubernetes.Clientset, yurtControllerManagerImage string) error {
 	if err := CreateServiceAccountFromYaml(client,
-		"kube-system", constants.YurtControllerManagerServiceAccount); err != nil {
+		SystemNamespace, constants.YurtControllerManagerServiceAccount); err != nil {
 		return err
 	}
 	// create the clusterrole
@@ -47,7 +47,7 @@ func DeployYurtControllerManager(client *kubernetes.Clientset, yurtControllerMan
 	}
 	// create the yurt-controller-manager deployment
 	if err := CreateDeployFromYaml(client,
-		"kube-system",
+		SystemNamespace,
 		constants.YurtControllerManagerDeployment,
 		map[string]string{
 			"image":         yurtControllerManagerImage,
@@ -75,7 +75,7 @@ func DeployYurtAppManager(
 	}
 
 	// 2. create the YurtAppManagerRole
-	if err := CreateRoleFromYaml(client, "kube-system",
+	if err := CreateRoleFromYaml(client, SystemNamespace,
 		constants.YurtAppManagerRole); err != nil {
 		return err
 	}
@@ -87,7 +87,7 @@ func DeployYurtAppManager(
 	}
 
 	// 4. create the RoleBinding
-	if err := CreateRoleBindingFromYaml(client, "kube-system",
+	if err := CreateRoleBindingFromYaml(client, SystemNamespace,
 		constants.YurtAppManagerRolebinding); err != nil {
 		return err
 	}
@@ -99,7 +99,7 @@ func DeployYurtAppManager(
 	}
 
 	// 6. create the Secret
-	if err := CreateSecretFromYaml(client, "kube-system",
+	if err := CreateSecretFromYaml(client, SystemNamespace,
 		constants.YurtAppManagerSecret); err != nil {
 		return err
 	}
@@ -112,7 +112,7 @@ func DeployYurtAppManager(
 
 	// 8. create the Deployment
 	if err := CreateDeployFromYaml(client,
-		"kube-system",
+		SystemNamespace,
 		constants.YurtAppManagerDeployment,
 		map[string]string{
 			"image":           yurtappmanagerImage,
@@ -148,7 +148,7 @@ func DeployYurttunnelServer(
 	}
 
 	// 2. create the ServiceAccount
-	if err := CreateServiceAccountFromYaml(client, "kube-system",
+	if err := CreateServiceAccountFromYaml(client, SystemNamespace,
 		constants.YurttunnelServerServiceAccount); err != nil {
 		return err
 	}
@@ -173,14 +173,14 @@ func DeployYurttunnelServer(
 
 	// 6. create the Configmap
 	if err := CreateConfigMapFromYaml(client,
-		"kube-system",
+		SystemNamespace,
 		constants.YurttunnelServerConfigMap); err != nil {
 		return err
 	}
 
 	// 7. create the Deployment
 	if err := CreateDeployFromYaml(client,
-		"kube-system",
+		SystemNamespace,
 		constants.YurttunnelServerDeployment,
 		map[string]string{
 			"image":           yurttunnelServerImage,
@@ -222,7 +222,7 @@ func DeployYurthubSetting(client *kubernetes.Clientset) error {
 
 	// 3. create the Configmap
 	if err := CreateConfigMapFromYaml(client,
-		"kube-system",
+		SystemNamespace,
 		edgenode.YurthubConfigMap); err != nil {
 		return err
 	}

diff --git a/pkg/yurtctl/util/kubernetes/util.go b/pkg/yurtctl/util/kubernetes/util.go
@@ -77,6 +77,7 @@ const (
 	DisableNodeControllerJobNameBase = "yurtctl-disable-node-controller"
 	// EnableNodeControllerJobNameBase is the prefix of the EnableNodeControllerJob name
 	EnableNodeControllerJobNameBase = "yurtctl-enable-node-controller"
+	SystemNamespace                 = "kube-system"
 )
 
 var (
@@ -211,7 +212,7 @@ func CreateDaemonSetFromYaml(cliSet *kubernetes.Clientset, dsTmpl string, ctx in
 	if !ok {
 		return fmt.Errorf("fail to assert daemonset: %v", err)
 	}
-	_, err = cliSet.AppsV1().DaemonSets("kube-system").Create(context.Background(), ds, metav1.CreateOptions{})
+	_, err = cliSet.AppsV1().DaemonSets(SystemNamespace).Create(context.Background(), ds, metav1.CreateOptions{})
 	if err != nil {
 		return fmt.Errorf("fail to create the daemonset/%s: %v", ds.Name, err)
 	}
@@ -229,7 +230,7 @@ func CreateServiceFromYaml(cliSet *kubernetes.Clientset, svcTmpl string) error {
 	if !ok {
 		return fmt.Errorf("fail to assert service: %v", err)
 	}
-	_, err = cliSet.CoreV1().Services("kube-system").Create(context.Background(), svc, metav1.CreateOptions{})
+	_, err = cliSet.CoreV1().Services(SystemNamespace).Create(context.Background(), svc, metav1.CreateOptions{})
 	if err != nil {
 		return fmt.Errorf("fail to create the service/%s: %s", svc.Name, err)
 	}
@@ -695,7 +696,7 @@ func usagesAndGroupsAreValid(token *kubeadmapi.BootstrapToken) bool {
 // find kube-controller-manager deployed through static file
 func GetKubeControllerManagerHANodes(cliSet *kubernetes.Clientset) ([]string, error) {
 	var kcmNodeNames []string
-	podLst, err := cliSet.CoreV1().Pods("kube-system").List(context.Background(), metav1.ListOptions{})
+	podLst, err := cliSet.CoreV1().Pods(SystemNamespace).List(context.Background(), metav1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}