feat: implementation for user defined configmap for cilium addon in cluster creation

api/v1alpha1/addon_types.go

@@ -140,8 +140,8 @@ type AddonValues struct {
 // typed referenced object inside the same namespace.
 // This is redacted from the upstream https://pkg.go.dev/k8s.io/api/core/v1#TypedLocalObjectReference
 type ValuesReference struct {
-	// Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
-	// +kubebuilder:validation:Enum=Secret;ConfigMap
+	// Kind is the type of resource being referenced, valid values are ('ConfigMap').
+	// +kubebuilder:validation:Enum=ConfigMap
 	// +kubebuilder:validation:Required
 	Kind string `json:"kind"`
 

api/v1alpha1/crds/caren.nutanix.com_awsclusterconfigs.yaml

@@ -110,9 +110,8 @@ spec:
                                 which contains inline YAML representing the values for the Helm chart.
                               properties:
                                 kind:
-                                  description: Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
+                                  description: Kind is the type of resource being referenced, valid values are ('ConfigMap').
                                   enum:
-                                    - Secret
                                     - ConfigMap
                                   type: string
                                 name:

api/v1alpha1/crds/caren.nutanix.com_dockerclusterconfigs.yaml

@@ -110,9 +110,8 @@ spec:
                                 which contains inline YAML representing the values for the Helm chart.
                               properties:
                                 kind:
-                                  description: Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
+                                  description: Kind is the type of resource being referenced, valid values are ('ConfigMap').
                                   enum:
-                                    - Secret
                                     - ConfigMap
                                   type: string
                                 name:

api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml

@@ -110,9 +110,8 @@ spec:
                                 which contains inline YAML representing the values for the Helm chart.
                               properties:
                                 kind:
-                                  description: Kind is the type of resource being referenced, valid values are ('Secret', 'ConfigMap').
+                                  description: Kind is the type of resource being referenced, valid values are ('ConfigMap').
                                   enum:
-                                    - Secret
                                     - ConfigMap
                                   type: string
                                 name:

docs/content/addons/cni.md

@@ -56,11 +56,11 @@ spec:
               strategy: HelmAddon
               values:
                 sourceRef:
-                  name: <NAME> #name of ConfigMap/Secret present in same namespace
-                  kind: <ConfigMap/Secret>
+                  name: <NAME> #name of ConfigMap present in same namespace
+                  kind: <ConfigMap>
 ```
 
-NOTE: Only ConfigMap/Secret kind objects will be allowed to refer helm values from.
+NOTE: Only ConfigMap kind objects will be allowed to refer helm values from.
 
 ConfigMap Format -
 
@@ -81,27 +81,7 @@ metadata:
   namespace: <CLUSTER_NAMESPACE>
 ```
 
-Secret Format -
-
-```yaml
-apiVersion: v1
-stringData:
-  values.yaml: |-
-    cni:
-      chainingMode: portmap
-      exclusive: false
-    ipam:
-      mode: kubernetes
-kind: Secret
-metadata:
-  labels:
-    clusterctl.cluster.x-k8s.io/move: ""
-  name: <CLUSTER_NAME>-cilium-cni-helm-values-template
-  namespace: <CLUSTER_NAMESPACE>
-type: Opaque
-```
-
-NOTE: ConfigMap/Secret should contain complete helm values for Cilium as same will be applied
+NOTE: ConfigMap should contain complete helm values for Cilium as same will be applied
 to Cilium helm chart as it is.
 
 To deploy the addon via `ClusterResourceSet` replace the value of `strategy` with `ClusterResourceSet`.

pkg/handlers/generic/lifecycle/cni/cilium/handler.go

@@ -153,6 +153,8 @@ func (c *CiliumCNI) apply(
 		return
 	}
 
+	targetNamespace := c.config.DefaultsNamespace()
+
 	var strategy addons.Applier
 	switch ptr.Deref(cniVar.Strategy, "") {
 	case v1alpha1.AddonStrategyClusterResourceSet:
@@ -175,9 +177,17 @@ func (c *CiliumCNI) apply(
 			)
 			return
 		}
+
+		helmValuesSourceRefName := c.config.helmAddonConfig.defaultValuesTemplateConfigMapName
+		if cniVar.Values != nil && cniVar.Values.SourceRef != nil {
+			helmValuesSourceRefName = cniVar.Values.SourceRef.Name
+			// Use cluster's namespace since Values.SourceRef is always a LocalObjectReference
+			targetNamespace = cluster.Namespace
+		}
+
 		strategy = addons.NewHelmAddonApplier(
 			addons.NewHelmAddonConfig(
-				c.config.helmAddonConfig.defaultValuesTemplateConfigMapName,
+				helmValuesSourceRefName,
 				defaultCiliumNamespace,
 				defaultCiliumReleaseName,
 			),
@@ -193,7 +203,7 @@ func (c *CiliumCNI) apply(
 		return
 	}
 
-	if err := strategy.Apply(ctx, cluster, c.config.DefaultsNamespace(), log); err != nil {
+	if err := strategy.Apply(ctx, cluster, targetNamespace, log); err != nil {
 		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
 		resp.SetMessage(err.Error())
 		return

pkg/handlers/generic/lifecycle/cni/variables_test.go

@@ -40,6 +40,26 @@ var testDefs = []capitest.VariableTestDef{{
 			},
 		},
 	},
+}, {
+	Name: "set with valid provider using HelmAddon strategy and custom helm values",
+	Vals: apivariables.ClusterConfigSpec{
+		Addons: &apivariables.Addons{
+			GenericAddons: v1alpha1.GenericAddons{
+				CNI: &v1alpha1.CNI{
+					Provider: v1alpha1.CNIProviderCilium,
+					Strategy: ptr.To(v1alpha1.AddonStrategyHelmAddon),
+					AddonConfig: v1alpha1.AddonConfig{
+						Values: &v1alpha1.AddonValues{
+							SourceRef: &v1alpha1.ValuesReference{
+								Name: "custom-cilium-cni-helm-values",
+								Kind: "ConfigMap",
+							},
+						},
+					},
+				},
+			},
+		},
+	},
 }, {
 	Name: "set with invalid provider",
 	Vals: apivariables.ClusterConfigSpec{