feat: implementation for user defined cilium configmap

Author: manoj-nutanix

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

@@ -153,6 +153,8 @@ func (c *CiliumCNI) apply(
 		return
 	}
 
+	defaultNamespace := c.config.DefaultsNamespace()
+
 	var strategy addons.Applier
 	switch ptr.Deref(cniVar.Strategy, "") {
 	case v1alpha1.AddonStrategyClusterResourceSet:
@@ -175,9 +177,16 @@ func (c *CiliumCNI) apply(
 			)
 			return
 		}
+
+		helmValuesConfigmapRef := c.config.helmAddonConfig.defaultValuesTemplateConfigMapName
+		if cniVar.Values != nil && cniVar.Values.SourceRef != nil {
+			helmValuesConfigmapRef = cniVar.Values.SourceRef.Name
+			defaultNamespace = cluster.Namespace
+		}
+
 		strategy = addons.NewHelmAddonApplier(
 			addons.NewHelmAddonConfig(
-				c.config.helmAddonConfig.defaultValuesTemplateConfigMapName,
+				helmValuesConfigmapRef,
 				defaultCiliumNamespace,
 				defaultCiliumReleaseName,
 			),
@@ -193,7 +202,7 @@ func (c *CiliumCNI) apply(
 		return
 	}
 
-	if err := strategy.Apply(ctx, cluster, c.config.DefaultsNamespace(), log); err != nil {
+	if err := strategy.Apply(ctx, cluster, defaultNamespace, 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{