Skip to content

Commit

Permalink
Set UseGardenerNodeAgent option based on gardenlet feature gate
Browse files Browse the repository at this point in the history
  • Loading branch information
rfranzke committed Oct 26, 2023
1 parent 96607fa commit 4a07b05
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions charts/gardener-extension-os-coreos/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ spec:
- --ignore-operation-annotation={{ .Values.controllers.ignoreOperationAnnotation }}
- --gardener-version={{ .Values.gardener.version }}
- --metrics-bind-address=:{{ .Values.metrics.port }}
{{- if .Values.gardener.gardenlet.featureGates.UseGardenerNodeAgent }}
- --gardenlet-uses-gardener-node-agent={{ .Values.gardener.gardenlet.featureGates.UseGardenerNodeAgent }}
{{- end }}
env:
- name: LEADER_ELECTION_NAMESPACE
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions charts/gardener-extension-os-coreos/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ disableControllers: []

gardener:
version: ""
gardenlet:
featureGates: {}

# settings for metrics, e.g. scraping by seed-prometheus
metrics:
Expand Down
3 changes: 3 additions & 0 deletions cmd/gardener-extension-os-coreos/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
heartbeatCtrlOpts.Completed().Apply(&heartbeat.DefaultAddOptions)

reconcileOpts.Completed().Apply(&operatingsystemconfig.DefaultAddOptions.IgnoreOperationAnnotation)
// TODO(rfranzke): Remove the UseGardenerNodeAgent fields as soon as the general options no longer support
// the GardenletUsesGardenerNodeAgent field.
operatingsystemconfig.DefaultAddOptions.UseGardenerNodeAgent = generalOpts.Completed().GardenletUsesGardenerNodeAgent

if err := controllerSwitches.Completed().AddToManager(ctx, mgr); err != nil {
return fmt.Errorf("could not add controller to manager: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion example/controller-registration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: os-coreos
type: helm
providerConfig:
chart: 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
chart: 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
values:
image:
tag: v1.19.0-dev
Expand Down

0 comments on commit 4a07b05

Please sign in to comment.