Skip to content

Commit cacfc9a

Browse files
committed
feat: implementation for user defined cilium configmap
1 parent 683aa47 commit cacfc9a

File tree

1 file changed

+11
-2
lines changed
  • pkg/handlers/generic/lifecycle/cni/cilium

1 file changed

+11
-2
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ func (c *CiliumCNI) apply(
153153
return
154154
}
155155

156+
defaultNamespace := c.config.DefaultsNamespace()
157+
156158
var strategy addons.Applier
157159
switch ptr.Deref(cniVar.Strategy, "") {
158160
case v1alpha1.AddonStrategyClusterResourceSet:
@@ -175,9 +177,16 @@ func (c *CiliumCNI) apply(
175177
)
176178
return
177179
}
180+
181+
helmValuesConfigmapRef := c.config.helmAddonConfig.defaultValuesTemplateConfigMapName
182+
if cniVar.Values != nil && cniVar.Values.SourceRef != nil {
183+
helmValuesConfigmapRef = cniVar.Values.SourceRef.Name
184+
defaultNamespace = cluster.Namespace
185+
}
186+
178187
strategy = addons.NewHelmAddonApplier(
179188
addons.NewHelmAddonConfig(
180-
c.config.helmAddonConfig.defaultValuesTemplateConfigMapName,
189+
helmValuesConfigmapRef,
181190
defaultCiliumNamespace,
182191
defaultCiliumReleaseName,
183192
),
@@ -193,7 +202,7 @@ func (c *CiliumCNI) apply(
193202
return
194203
}
195204

196-
if err := strategy.Apply(ctx, cluster, c.config.DefaultsNamespace(), log); err != nil {
205+
if err := strategy.Apply(ctx, cluster, defaultNamespace, log); err != nil {
197206
resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
198207
resp.SetMessage(err.Error())
199208
return

0 commit comments

Comments
 (0)