Revendor gardener/gardener@v1.45 and cleanup token projection artefacts

.github/ISSUE_TEMPLATE/bug.md

@@ -1,7 +1,6 @@
 ---
 name: Bug Report
 about: Report a bug encountered while working with this Gardener extension
-labels: kind/bug
 
 ---
 

.github/ISSUE_TEMPLATE/feature.md

@@ -1,7 +1,6 @@
 ---
 name: Enhancement Request
 about: Suggest an enhancement for this extension
-labels: kind/enhancement
 
 ---
 

.github/ISSUE_TEMPLATE/flaking-test.md

@@ -2,7 +2,6 @@
 name: Flaking Test
 about: Report flaky tests or jobs in Gardener CI
 title: "[Flaky Test] FLAKING TEST/SUITE"
-labels: kind/flake
 
 ---
 

.github/ISSUE_TEMPLATE/support.md

@@ -1,7 +1,6 @@
 ---
 name: Support Request
 about: Support request or question relating to this extension
-labels: kind/question
 
 ---
 

charts/gardener-extension-os-ubuntu/templates/deployment.yaml

@@ -32,9 +32,7 @@ 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-ubuntu/templates/serviceaccount.yaml

@@ -7,8 +7,4 @@ metadata:
     app.kubernetes.io/name: gardener-extension-os-ubuntu
     helm.sh/chart: gardener-extension-os-ubuntu
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- if ne .Values.gardener.version "" }}
-{{- if semverCompare ">= 1.37-0" .Values.gardener.version }}
 automountServiceAccountToken: false
-{{- end }}
-{{- end }}

cmd/gardener-extension-os-ubuntu/app/app.go

@@ -16,6 +16,7 @@ package app
 
 import (
 	"context"
+	"fmt"
 	"os"
 
 	"github.com/gardener/gardener-extension-os-ubuntu/pkg/generator"
@@ -30,6 +31,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	componentbaseconfig "k8s.io/component-base/config"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	runtimelog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
@@ -42,7 +44,8 @@ var (
 func NewControllerCommand(ctx context.Context) *cobra.Command {
 	g := generator.CloudInitGenerator()
 	if g == nil {
-		controllercmd.LogErrAndExit(nil, "Could not create Generator")
+		runtimelog.Log.Error(fmt.Errorf("generator is nil"), "Error executing the main controller command")
+		os.Exit(1)
 	}
 
 	var (
@@ -75,9 +78,9 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "os-" + ctrlName + "-controller-manager",
 
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := aggOption.Complete(); err != nil {
-				controllercmd.LogErrAndExit(err, "Error completing options")
+				return fmt.Errorf("error completing options: %w", err)
 			}
 
 			// TODO: Make these flags configurable via command line parameters or component config file.
@@ -93,24 +96,26 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 
 			mgr, err := manager.New(restOpts.Completed().Config, completedMgrOpts)
 			if err != nil {
-				controllercmd.LogErrAndExit(err, "Could not instantiate manager")
+				return fmt.Errorf("could not instantiate manager: %w", err)
 			}
 
 			if err := extcontroller.AddToScheme(mgr.GetScheme()); err != nil {
-				controllercmd.LogErrAndExit(err, "Could not update manager scheme")
+				return fmt.Errorf("could not update manager scheme: %w", err)
 			}
 
 			ctrlOpts.Completed().Apply(&oscommon.DefaultAddOptions.Controller)
 
 			reconcileOpts.Completed().Apply(&oscommon.DefaultAddOptions.IgnoreOperationAnnotation)
 
 			if err := controllerSwitches.Completed().AddToManager(mgr); err != nil {
-				controllercmd.LogErrAndExit(err, "Could not add controller to manager")
+				return fmt.Errorf("could not add controller to manager: %w", err)
 			}
 
 			if err := mgr.Start(ctx); err != nil {
-				controllercmd.LogErrAndExit(err, "Error running manager")
+				return fmt.Errorf("error running manager: %w", err)
 			}
+
+			return nil
 		},
 	}
 

cmd/gardener-extension-os-ubuntu/main.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/gardener/gardener-extension-os-ubuntu/cmd/gardener-extension-os-ubuntu/app"
@@ -31,7 +30,7 @@ func main() {
 	cmd := app.NewControllerCommand(signals.SetupSignalHandler())
 
 	if err := cmd.Execute(); err != nil {
-		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		runtimelog.Log.Error(err, "Error executing the main controller command")
 		os.Exit(1)
 	}
 }

example/controller-registration.yaml

@@ -5,7 +5,7 @@ metadata:
   name: os-ubuntu
 type: helm
 providerConfig:
-  chart: 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
+  chart: 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
   values:
     image:
       tag: v1.15.0-dev

go.mod

@@ -3,24 +3,32 @@ module github.com/gardener/gardener-extension-os-ubuntu
 go 1.16
 
 require (
-	github.com/gardener/gardener v1.39.0
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.15.0
+	github.com/gardener/gardener v1.45.0
+	github.com/onsi/ginkgo/v2 v2.1.3
+	github.com/onsi/gomega v1.18.0
 	github.com/spf13/cobra v1.2.1
-	golang.org/x/tools v0.1.7
-	k8s.io/api v0.22.2
-	k8s.io/apimachinery v0.22.2
+	golang.org/x/tools v0.1.9
+	k8s.io/api v0.23.3
+	k8s.io/apimachinery v0.23.3
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/component-base v0.22.2
-	sigs.k8s.io/controller-runtime v0.10.2
+	k8s.io/component-base v0.23.3
+	sigs.k8s.io/controller-runtime v0.11.1
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.22.2
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.22.2
-	k8s.io/client-go => k8s.io/client-go v0.22.2
-	k8s.io/code-generator => k8s.io/code-generator v0.22.2
-	k8s.io/component-base => k8s.io/component-base v0.22.2
+	k8s.io/api => k8s.io/api v0.23.3
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.23.3
+	k8s.io/autoscaler => k8s.io/autoscaler v0.0.0-20201008123815-1d78814026aa // translates to k8s.io/autoscaler/vertical-pod-autoscaler@v0.9.0
+	k8s.io/autoscaler/vertical-pod-autoscaler => k8s.io/autoscaler/vertical-pod-autoscaler v0.9.0
+	k8s.io/client-go => k8s.io/client-go v0.23.3
+	k8s.io/code-generator => k8s.io/code-generator v0.23.3
+	k8s.io/component-base => k8s.io/component-base v0.23.3
 	k8s.io/helm => k8s.io/helm v2.13.1+incompatible
 )
+
+// workaround for https://github.com/gardener/hvpa-controller/issues/92, remove once it's fixed
+replace (
+	github.com/gardener/hvpa-controller => github.com/gardener/hvpa-controller v0.4.0
+	github.com/gardener/hvpa-controller/api => github.com/gardener/hvpa-controller/api v0.4.0
+)