Merge pull request #2862 from zhanggbj/remove_unused_var

🌱 Remove infraServer and credsSecretName from supervisor ClusterClass
kubernetes-sigs · Apr 3, 2024 · f4a53e8 · f4a53e8
2 parents dbedef4 + 7b5f0ed
commit f4a53e8
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 97 deletions.
diff --git a/packaging/flavorgen/flavors/clusterclass_generators.go b/packaging/flavorgen/flavors/clusterclass_generators.go
@@ -55,7 +55,7 @@ func newClusterClass() clusterv1.ClusterClass {
 			},
 			ControlPlane: getControlPlaneClass(),
 			Workers:      getWorkersClass(),
-			Variables:    getClusterClassVariables(),
+			Variables:    getClusterClassVariables(false),
 			Patches:      getClusterClassPatches(),
 		},
 	}
@@ -81,7 +81,7 @@ func newVMWareClusterClass() clusterv1.ClusterClass {
 			},
 			ControlPlane: getVMWareControlPlaneClass(),
 			Workers:      getVMWareWorkersClass(),
-			Variables:    getClusterClassVariables(),
+			Variables:    getClusterClassVariables(true),
 			Patches:      getVMWareClusterClassPatches(),
 		},
 	}
@@ -238,8 +238,8 @@ func getEnableSSHIntoNodesTemplate() *string {
 	return ptr.To(string(templateStr))
 }
 
-func getClusterClassVariables() []clusterv1.ClusterClassVariable {
-	return []clusterv1.ClusterClassVariable{
+func getClusterClassVariables(supervisorMode bool) []clusterv1.ClusterClassVariable {
+	variables := []clusterv1.ClusterClassVariable{
 		{
 			Name:     "sshKey",
 			Required: false,
@@ -250,19 +250,6 @@ func getClusterClassVariables() []clusterv1.ClusterClassVariable {
 				},
 			},
 		},
-		{
-			Name:     "infraServer",
-			Required: true,
-			Schema: clusterv1.VariableSchema{
-				OpenAPIV3Schema: clusterv1.JSONSchemaProps{
-					Type: "object",
-					Properties: map[string]clusterv1.JSONSchemaProps{
-						"url":        {Type: "string"},
-						"thumbprint": {Type: "string"},
-					},
-				},
-			},
-		},
 		{
 			Name:     "controlPlaneIpAddr",
 			Required: true,
@@ -283,16 +270,6 @@ func getClusterClassVariables() []clusterv1.ClusterClassVariable {
 				},
 			},
 		},
-		{
-			Name:     "credsSecretName",
-			Required: true,
-			Schema: clusterv1.VariableSchema{
-				OpenAPIV3Schema: clusterv1.JSONSchemaProps{
-					Type:        "string",
-					Description: "Secret containing the credentials for the infra cluster.",
-				},
-			},
-		},
 		{
 			Name:     "kubeVipPodManifest",
 			Required: true,
@@ -304,6 +281,38 @@ func getClusterClassVariables() []clusterv1.ClusterClassVariable {
 			},
 		},
 	}
+
+	if !supervisorMode {
+		varForNoneSupervisorMode := []clusterv1.ClusterClassVariable{
+			{
+				Name:     "infraServer",
+				Required: true,
+				Schema: clusterv1.VariableSchema{
+					OpenAPIV3Schema: clusterv1.JSONSchemaProps{
+						Type: "object",
+						Properties: map[string]clusterv1.JSONSchemaProps{
+							"url":        {Type: "string"},
+							"thumbprint": {Type: "string"},
+						},
+					},
+				},
+			},
+			{
+				Name:     "credsSecretName",
+				Required: true,
+				Schema: clusterv1.VariableSchema{
+					OpenAPIV3Schema: clusterv1.JSONSchemaProps{
+						Type:        "string",
+						Description: "Secret containing the credentials for the infra cluster.",
+					},
+				},
+			},
+		}
+
+		variables = append(variables, varForNoneSupervisorMode...)
+	}
+
+	return variables
 }
 
 func newVSphereClusterTemplate() infrav1.VSphereClusterTemplate {

diff --git a/packaging/flavorgen/flavors/flavors.go b/packaging/flavorgen/flavors/flavors.go
@@ -82,7 +82,7 @@ func ClusterClassTemplateSupervisor() []runtime.Object {
 }
 
 func ClusterTopologyTemplateKubeVIP() ([]runtime.Object, error) {
-	cluster, err := newClusterTopologyCluster()
+	cluster, err := newClusterTopologyCluster(false)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func ClusterTopologyTemplateKubeVIP() ([]runtime.Object, error) {
 }
 
 func ClusterTopologyTemplateSupervisor() ([]runtime.Object, error) {
-	cluster, err := newClusterTopologyCluster()
+	cluster, err := newClusterTopologyCluster(true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/packaging/flavorgen/flavors/generators.go b/packaging/flavorgen/flavors/generators.go
@@ -99,8 +99,8 @@ systemd:
         EnvironmentFile=/run/metadata/*`
 )
 
-func newClusterTopologyCluster() (clusterv1.Cluster, error) {
-	variables, err := clusterTopologyVariables()
+func newClusterTopologyCluster(supervisorMode bool) (clusterv1.Cluster, error) {
+	variables, err := clusterTopologyVariables(supervisorMode)
 	if err != nil {
 		return clusterv1.Cluster{}, errors.Wrap(err, "failed to create ClusterTopologyCluster template")
 	}
@@ -136,7 +136,7 @@ func newClusterTopologyCluster() (clusterv1.Cluster, error) {
 	}, nil
 }
 
-func clusterTopologyVariables() ([]clusterv1.ClusterVariable, error) {
+func clusterTopologyVariables(supervisorMode bool) ([]clusterv1.ClusterVariable, error) {
 	sshKey, err := json.Marshal(env.VSphereSSHAuthorizedKeysVar)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to json-encode variable VSphereSSHAuthorizedKeysVar: %q", env.VSphereSSHAuthorizedKeysVar)
@@ -149,32 +149,18 @@ func clusterTopologyVariables() ([]clusterv1.ClusterVariable, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to json-encode variable ControlPlaneEndpointPortVar: %q", env.ControlPlaneEndpointPortVar)
 	}
-	secretName, err := json.Marshal(env.ClusterNameVar)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed to json-encode variable ClusterNameVar: %q", env.ClusterNameVar)
-	}
-
 	kubeVipVariable, err := kubevip.TopologyVariable()
 	if err != nil {
 		return nil, err
 	}
-	infraServerValue, err := getInfraServerValue()
-	if err != nil {
-		return nil, err
-	}
-	return []clusterv1.ClusterVariable{
+
+	variables := []clusterv1.ClusterVariable{
 		{
 			Name: "sshKey",
 			Value: apiextensionsv1.JSON{
 				Raw: sshKey,
 			},
 		},
-		{
-			Name: "infraServer",
-			Value: apiextensionsv1.JSON{
-				Raw: infraServerValue,
-			},
-		},
 		*kubeVipVariable,
 		{
 			Name: "controlPlaneIpAddr",
@@ -188,13 +174,36 @@ func clusterTopologyVariables() ([]clusterv1.ClusterVariable, error) {
 				Raw: controlPlanePort,
 			},
 		},
-		{
-			Name: "credsSecretName",
-			Value: apiextensionsv1.JSON{
-				Raw: secretName,
+	}
+
+	if !supervisorMode {
+		infraServerValue, err := getInfraServerValue()
+		if err != nil {
+			return nil, err
+		}
+		secretName, err := json.Marshal(env.ClusterNameVar)
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to json-encode variable ClusterNameVar: %q", env.ClusterNameVar)
+		}
+
+		varForNoneSupervisorMode := []clusterv1.ClusterVariable{
+			{
+				Name: "infraServer",
+				Value: apiextensionsv1.JSON{
+					Raw: infraServerValue,
+				},
 			},
-		},
-	}, nil
+			{
+				Name: "credsSecretName",
+				Value: apiextensionsv1.JSON{
+					Raw: secretName,
+				},
+			},
+		}
+
+		variables = append(variables, varForNoneSupervisorMode...)
+	}
+	return variables, nil
 }
 
 func getInfraServerValue() ([]byte, error) {

diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml
@@ -14,10 +14,6 @@ spec:
     variables:
     - name: sshKey
       value: '${VSPHERE_SSH_AUTHORIZED_KEY}'
-    - name: infraServer
-      value:
-        thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
-        url: '${VSPHERE_SERVER}'
     - name: kubeVipPodManifest
       value: |
         apiVersion: v1
@@ -93,8 +89,6 @@ spec:
       value: ${CONTROL_PLANE_ENDPOINT_IP}
     - name: controlPlanePort
       value: ${CONTROL_PLANE_ENDPOINT_PORT:=6443}
-    - name: credsSecretName
-      value: '${CLUSTER_NAME}'
     version: '${KUBERNETES_VERSION}'
     workers:
       machineDeployments:

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -14,10 +14,6 @@ spec:
     variables:
     - name: sshKey
       value: '${VSPHERE_SSH_AUTHORIZED_KEY}'
-    - name: infraServer
-      value:
-        thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
-        url: '${VSPHERE_SERVER}'
     - name: kubeVipPodManifest
       value: |
         apiVersion: v1
@@ -93,6 +89,10 @@ spec:
       value: ${CONTROL_PLANE_ENDPOINT_IP}
     - name: controlPlanePort
       value: ${CONTROL_PLANE_ENDPOINT_PORT:=6443}
+    - name: infraServer
+      value:
+        thumbprint: '${VSPHERE_TLS_THUMBPRINT}'
+        url: '${VSPHERE_SERVER}'
     - name: credsSecretName
       value: '${CLUSTER_NAME}'
     version: '${KUBERNETES_VERSION}'

diff --git a/templates/clusterclass-template-supervisor.yaml b/templates/clusterclass-template-supervisor.yaml
@@ -194,17 +194,6 @@ spec:
       openAPIV3Schema:
         description: Public key to SSH onto the cluster nodes.
         type: string
-  - metadata: {}
-    name: infraServer
-    required: true
-    schema:
-      openAPIV3Schema:
-        properties:
-          thumbprint:
-            type: string
-          url:
-            type: string
-        type: object
   - metadata: {}
     name: controlPlaneIpAddr
     required: true
@@ -219,13 +208,6 @@ spec:
       openAPIV3Schema:
         description: Port for the control plane endpoint.
         type: integer
-  - metadata: {}
-    name: credsSecretName
-    required: true
-    schema:
-      openAPIV3Schema:
-        description: Secret containing the credentials for the infra cluster.
-        type: string
   - metadata: {}
     name: kubeVipPodManifest
     required: true

diff --git a/templates/clusterclass-template.yaml b/templates/clusterclass-template.yaml
@@ -208,17 +208,6 @@ spec:
       openAPIV3Schema:
         description: Public key to SSH onto the cluster nodes.
         type: string
-  - metadata: {}
-    name: infraServer
-    required: true
-    schema:
-      openAPIV3Schema:
-        properties:
-          thumbprint:
-            type: string
-          url:
-            type: string
-        type: object
   - metadata: {}
     name: controlPlaneIpAddr
     required: true
@@ -234,18 +223,29 @@ spec:
         description: Port for the control plane endpoint.
         type: integer
   - metadata: {}
-    name: credsSecretName
+    name: kubeVipPodManifest
     required: true
     schema:
       openAPIV3Schema:
-        description: Secret containing the credentials for the infra cluster.
+        description: kube-vip manifest for the control plane.
         type: string
   - metadata: {}
-    name: kubeVipPodManifest
+    name: infraServer
     required: true
     schema:
       openAPIV3Schema:
-        description: kube-vip manifest for the control plane.
+        properties:
+          thumbprint:
+            type: string
+          url:
+            type: string
+        type: object
+  - metadata: {}
+    name: credsSecretName
+    required: true
+    schema:
+      openAPIV3Schema:
+        description: Secret containing the credentials for the infra cluster.
         type: string
   workers:
     machineDeployments: