From e0099bee66a0910e944b5e93701e3d2386b8b0dd Mon Sep 17 00:00:00 2001 From: Rafael Franzke Date: Thu, 26 Oct 2023 13:57:19 +0200 Subject: [PATCH] Set `UseGardenerNodeAgent` option based on gardenlet feature gate --- charts/os-metal/templates/deployment.yaml | 3 +++ charts/os-metal/values.yaml | 4 ++++ cmd/app/app.go | 3 +++ example/controller-registration.yaml | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/charts/os-metal/templates/deployment.yaml b/charts/os-metal/templates/deployment.yaml index 6f8ffab..89ba571 100644 --- a/charts/os-metal/templates/deployment.yaml +++ b/charts/os-metal/templates/deployment.yaml @@ -32,6 +32,9 @@ spec: - --heartbeat-renew-interval-seconds={{ .Values.controllers.heartbeat.renewIntervalSeconds }} - --disable-controllers={{ .Values.disableControllers | join "," }} - --ignore-operation-annotation={{ .Values.controllers.ignoreOperationAnnotation }} + {{- if .Values.gardener.gardenlet.featureGates.UseGardenerNodeAgent }} + - --gardenlet-uses-gardener-node-agent={{ .Values.gardener.gardenlet.featureGates.UseGardenerNodeAgent }} + {{- end }} env: - name: LEADER_ELECTION_NAMESPACE valueFrom: diff --git a/charts/os-metal/values.yaml b/charts/os-metal/values.yaml index 9fd0193..451cf9c 100644 --- a/charts/os-metal/values.yaml +++ b/charts/os-metal/values.yaml @@ -12,3 +12,7 @@ controllers: renewIntervalSeconds: 30 disableControllers: [] + +gardener: + gardenlet: + featureGates: {} diff --git a/cmd/app/app.go b/cmd/app/app.go index 92062ae..8564c2e 100644 --- a/cmd/app/app.go +++ b/cmd/app/app.go @@ -112,6 +112,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) diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index a9eac2f..f73f7fc 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -5,7 +5,7 @@ metadata: name: os-metal type: helm providerConfig: - chart: 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 + chart: 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 values: image: tag: 0.0.1