Enable ServiceAccount token projection

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 #

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:

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 }}

charts/gardener-extension-os-suse-chost/values.yaml

@@ -23,3 +23,5 @@ leaderElection:
 
 disableControllers: []
 
+gardener:
+  version: ""

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,

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