Enable ServiceAccount token projection

gardener · Dec 17, 2021 · 3f68b09 · 3f68b09
1 parent dace4aa
commit 3f68b09
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -34,7 +34,8 @@ start:
 		-ldflags $(LD_FLAGS) \
 		./cmd/$(EXTENSION_PREFIX)-$(NAME) \
 		--leader-election=$(LEADER_ELECTION) \
-		--ignore-operation-annotation=$(IGNORE_OPERATION_ANNOTATION)
+		--ignore-operation-annotation=$(IGNORE_OPERATION_ANNOTATION) \
+		--gardener-version="v1.39.0"
 
 #################################################################
 # Rules related to binary build, Docker image build and release #

diff --git a/charts/gardener-extension-os-suse-chost/templates/deployment.yaml b/charts/gardener-extension-os-suse-chost/templates/deployment.yaml
@@ -32,6 +32,9 @@ spec:
         - --max-concurrent-reconciles={{ .Values.controllers.concurrentSyncs }}
         - --disable-controllers={{ .Values.disableControllers | join "," }}
         - --ignore-operation-annotation={{ .Values.controllers.ignoreOperationAnnotation }}
+        {{- if .Values.gardener.version }}
+        - --gardener-version={{ .Values.gardener.version }}
+        {{- end }}
         env:
         - name: LEADER_ELECTION_NAMESPACE
           valueFrom:

diff --git a/charts/gardener-extension-os-suse-chost/templates/serviceaccount.yaml b/charts/gardener-extension-os-suse-chost/templates/serviceaccount.yaml
@@ -7,3 +7,8 @@ metadata:
     app.kubernetes.io/name: gardener-extension-os-suse-chost
     helm.sh/chart: gardener-extension-os-suse-chost
     app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if ne .Values.gardener.version "" }}
+{{- if semverCompare ">= 1.37-0" .Values.gardener.version }}
+automountServiceAccountToken: false
+{{- end }}
+{{- end }}
diff --git a/charts/gardener-extension-os-suse-chost/values.yaml b/charts/gardener-extension-os-suse-chost/values.yaml
@@ -23,3 +23,5 @@ leaderElection:
 
 disableControllers: []
 
+gardener:
+  version: ""
diff --git a/cmd/gardener-extension-os-suse-chost/app/app.go b/cmd/gardener-extension-os-suse-chost/app/app.go
@@ -47,8 +47,9 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 	}
 
 	var (
-		restOpts = &controllercmd.RESTOptions{}
-		mgrOpts  = &controllercmd.ManagerOptions{
+		generalOpts = &controllercmd.GeneralOptions{}
+		restOpts    = &controllercmd.RESTOptions{}
+		mgrOpts     = &controllercmd.ManagerOptions{
 			LeaderElection:             true,
 			LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
 			LeaderElectionID:           controllercmd.LeaderElectionNameID(susechost.ControllerName),
@@ -63,6 +64,7 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 		controllerSwitches = oscommoncmd.SwitchOptions(susechost.ControllerName, osTypes, g)
 
 		aggOption = controllercmd.NewOptionAggregator(
+			generalOpts,
 			restOpts,
 			mgrOpts,
 			ctrlOpts,

diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml
@@ -5,7 +5,7 @@ metadata:
   name: os-suse-chost
 type: helm
 providerConfig:
-  chart: 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
+  chart: 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
   values:
     image:
       tag: v1.15.0-dev