fix: comments after review

Author: faiq

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

@@ -1,37 +1,33 @@
 apiVersion: v1
 data:
-  aws-ccm: |
-    defaultChartName: aws-cloud-controller-manager
-    defaultChartVersion: ""
-    defaultRepositoryUrl: https://kubernetes.github.io/cloud-provider-aws
   aws-ebs-csi: |
-    defaultChartName: aws-ebs-csi-driver
-    defaultChartVersion: v2.28.1
-    defaultRepositoryUrl: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
+    ChartName: aws-ebs-csi-driver
+    ChartVersion: v2.28.1
+    RepositoryURL: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
   cilium: |
-    defaultChartName: cilium
-    defaultChartVersion: 1.15.0
-    defaultRepositoryUrl: https://helm.cilium.io/
+    ChartName: cilium
+    ChartVersion: 1.15.0
+    RepositoryURL: https://helm.cilium.io/
   cluster-autoscaler: |
-    defaultChartName: cluster-autoscaler
-    defaultChartVersion: 9.35.0
-    defaultRepositoryUrl: https://kubernetes.github.io/autoscaler
+    ChartName: cluster-autoscaler
+    ChartVersion: 9.35.0
+    RepositoryURL: https://kubernetes.github.io/autoscaler
   nfd: |
-    defaultChartName: node-feature-discovery
-    defaultChartVersion: 0.15.2
-    defaultRepositoryUrl: https://kubernetes-sigs.github.io/node-feature-discovery/charts
+    ChartName: node-feature-discovery
+    ChartVersion: 0.15.2
+    RepositoryURL: https://kubernetes-sigs.github.io/node-feature-discovery/charts
   nutanix-snapshot-csi: |
-    defaultChartName: nutanix-csi-snapshot
-    defaultChartVersion: v6.3.2
-    defaultRepositoryUrl: https://nutanix.github.io/helm/
+    ChartName: nutanix-csi-snapshot
+    ChartVersion: v6.3.2
+    RepositoryURL: https://nutanix.github.io/helm/
   nutanix-storage-csi: |
-    defaultChartName: nutanix-csi-storage
-    defaultChartVersion: v2.6.6
-    defaultRepositoryUrl: https://nutanix.github.io/helm/
+    ChartName: nutanix-csi-storage
+    ChartVersion: v2.6.6
+    RepositoryURL: https://nutanix.github.io/helm/
   tigera-operator: |
-    defaultChartName: tigera-operator
-    defaultChartVersion: v3.26.4
-    defaultRepositoryUrl: https://docs.tigera.io/calico/charts
+    ChartName: tigera-operator
+    ChartVersion: v3.26.4
+    RepositoryURL: https://docs.tigera.io/calico/charts
 kind: ConfigMap
 metadata:
   creationTimestamp: null

hack/tools/helm-cm/main.go

@@ -70,10 +70,10 @@ func main() {
 }
 
 type configMapInfo struct {
-	configMapFieldName   string
-	DefaultRepositoryURL string `json:"defaultRepositoryUrl"`
-	DefaultChartVersion  string `json:"defaultChartVersion"`
-	DefaultChartName     string `json:"defaultChartName"`
+	configMapFieldName string
+	RepositoryURL      string `json:"RepositoryURL"`
+	ChartVersion       string `json:"ChartVersion"`
+	ChartName          string `json:"ChartName"`
 }
 
 func createConfigMapFromDir(kustomizeDir string) (*corev1.ConfigMap, error) {
@@ -91,7 +91,7 @@ func createConfigMapFromDir(kustomizeDir string) (*corev1.ConfigMap, error) {
 		if err != nil {
 			return err
 		}
-		if strings.Contains(filepath, "kustomization.yaml.tmpl") {
+		if strings.Contains(filepath, "kustomization.yaml.tmpl") && !isIgnored(filepath) {
 			f, err := os.Open(path.Join(fullPath, filepath))
 			if err != nil {
 				return fmt.Errorf("failed to open file: %w", err)
@@ -119,13 +119,13 @@ func createConfigMapFromDir(kustomizeDir string) (*corev1.ConfigMap, error) {
 			name := info["name"].(string)
 			dirName := strings.Split(filepath, "/")[0]
 			i := configMapInfo{
-				configMapFieldName:   dirName,
-				DefaultRepositoryURL: repo,
-				DefaultChartName:     name,
+				configMapFieldName: dirName,
+				RepositoryURL:      repo,
+				ChartName:          name,
 			}
 			versionEnvVar := info["version"].(string)
 			version := os.ExpandEnv(versionEnvVar)
-			i.DefaultChartVersion = version
+			i.ChartVersion = version
 			results = append(results, i)
 			return nil
 		}
@@ -151,3 +151,16 @@ func createConfigMapFromDir(kustomizeDir string) (*corev1.ConfigMap, error) {
 	}
 	return &finalCM, err
 }
+
+var ignored = []string{
+	"aws-ccm",
+}
+
+func isIgnored(filepath string) bool {
+	for _, i := range ignored {
+		if strings.Contains(filepath, i) {
+			return true
+		}
+	}
+	return false
+}

pkg/handlers/generic/lifecycle/config/cm.go

@@ -32,9 +32,9 @@ type HelmChartGetter struct {
 }
 
 type HelmChart struct {
-	Name       string `yaml:"defaultChartName"`
-	Version    string `yaml:"defaultChartVersion"`
-	Repository string `yaml:"defaultRepositoryUrl"`
+	Name       string `yaml:"ChartName"`
+	Version    string `yaml:"ChartVersion"`
+	Repository string `yaml:"RepositoryURL"`
 }
 
 func NewHelmChartGetterFromConfigMap(