Merge pull request #130 from rfranzke/gna

Adapt to changes needed for `gardener-node-agent`

Makefile

@@ -65,6 +65,10 @@ docker-images:
 # Rules for verification, formatting, linting, testing and cleaning #
 #####################################################################
 
+.PHONY: tidy
+tidy:
+	@GO111MODULE=on go mod tidy
+
 .PHONY: revendor
 revendor:
 	@GO111MODULE=on go mod tidy

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

@@ -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:

charts/gardener-extension-os-gardenlinux/values.yaml

@@ -23,6 +23,8 @@ disableControllers: []
 
 gardener:
   version: ""
+  gardenlet:
+    featureGates: {}
 
 # settings for metrics, e.g. scraping by seed-prometheus
 metrics:

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

@@ -23,19 +23,17 @@ import (
 	controllercmd "github.com/gardener/gardener/extensions/pkg/controller/cmd"
 	"github.com/gardener/gardener/extensions/pkg/controller/heartbeat"
 	heartbeatcmd "github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd"
-	"github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon"
-	oscommoncmd "github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon/cmd"
+	osccontroller "github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig"
 	"github.com/gardener/gardener/extensions/pkg/util"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	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"
 
-	"github.com/gardener/gardener-extension-os-gardenlinux/pkg/generator"
-	"github.com/gardener/gardener-extension-os-gardenlinux/pkg/generator/gardenlinux"
-	"github.com/gardener/gardener-extension-os-gardenlinux/pkg/generator/memoryone"
+	"github.com/gardener/gardener-extension-os-gardenlinux/pkg/controller/operatingsystemconfig"
+	"github.com/gardener/gardener-extension-os-gardenlinux/pkg/gardenlinux"
+	"github.com/gardener/gardener-extension-os-gardenlinux/pkg/memoryone"
 )
 
 var (
@@ -45,12 +43,6 @@ var (
 
 // NewControllerCommand returns a new Command with a new Generator
 func NewControllerCommand(ctx context.Context) *cobra.Command {
-	gardenLinuxGenerator := generator.CloudInitGenerator()
-	if gardenLinuxGenerator == nil {
-		runtimelog.Log.Error(fmt.Errorf("generator is nil"), "Error executing the main controller command")
-		os.Exit(1)
-	}
-
 	var (
 		generalOpts = &controllercmd.GeneralOptions{}
 		restOpts    = &controllercmd.RESTOptions{}
@@ -71,7 +63,10 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 
 		reconcileOpts = &controllercmd.ReconcilerOptions{}
 
-		controllerSwitches = oscommoncmd.SwitchOptions(ctrlName, osTypes, gardenLinuxGenerator)
+		controllerSwitches = controllercmd.NewSwitchOptions(
+			controllercmd.Switch(osccontroller.ControllerName, operatingsystemconfig.AddToManager),
+			controllercmd.Switch(heartbeat.ControllerName, heartbeat.AddToManager),
+		)
 
 		aggOption = controllercmd.NewOptionAggregator(
 			generalOpts,
@@ -120,10 +115,13 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 				return fmt.Errorf("could not update manager scheme: %w", err)
 			}
 
-			ctrlOpts.Completed().Apply(&oscommon.DefaultAddOptions.Controller)
+			ctrlOpts.Completed().Apply(&operatingsystemconfig.DefaultAddOptions.Controller)
 			heartbeatCtrlOpts.Completed().Apply(&heartbeat.DefaultAddOptions)
 
-			reconcileOpts.Completed().Apply(&oscommon.DefaultAddOptions.IgnoreOperationAnnotation)
+			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)

example/controller-registration.yaml

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

go.mod

@@ -4,39 +4,41 @@ go 1.21
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
-	github.com/gardener/gardener v1.81.0
+	github.com/gardener/gardener v1.84.0
 	github.com/go-logr/logr v1.2.4
-	github.com/onsi/ginkgo/v2 v2.11.0
-	github.com/onsi/gomega v1.27.10
+	github.com/onsi/ginkgo/v2 v2.13.0
+	github.com/onsi/gomega v1.29.0
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/tools v0.13.0
-	k8s.io/api v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/code-generator v0.28.2
-	k8s.io/component-base v0.28.2
+	k8s.io/api v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/code-generator v0.28.3
+	k8s.io/component-base v0.28.3
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/controller-runtime v0.16.2
+	sigs.k8s.io/controller-runtime v0.16.3
 )
 
 require (
-	github.com/BurntSushi/toml v1.0.0 // indirect
+	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/fluent/fluent-operator/v2 v2.2.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gardener/etcd-druid v0.19.2 // indirect
+	github.com/gardener/etcd-druid v0.20.1 // indirect
 	github.com/gardener/hvpa-controller/api v0.5.0 // indirect
-	github.com/gardener/machine-controller-manager v0.48.1 // indirect
+	github.com/gardener/machine-controller-manager v0.50.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-logr/zapr v1.2.4 // indirect
 	github.com/go-openapi/errors v0.20.3 // indirect
@@ -50,15 +52,16 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/ironcore-dev/vgopath v0.1.3 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
@@ -83,13 +86,13 @@ require (
 	go.uber.org/mock v0.2.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -102,18 +105,18 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	istio.io/api v0.0.0-20230217221049-9d422bf48675 // indirect
 	istio.io/client-go v1.17.1 // indirect
-	k8s.io/apiextensions-apiserver v0.28.2 // indirect
+	k8s.io/apiextensions-apiserver v0.28.3 // indirect
 	k8s.io/autoscaler/vertical-pod-autoscaler v0.14.0 // indirect
-	k8s.io/client-go v0.28.2 // indirect
+	k8s.io/client-go v0.28.3 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/helm v2.16.1+incompatible // indirect
+	k8s.io/helm v2.17.0+incompatible // indirect
 	k8s.io/klog v1.0.0 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-aggregator v0.28.2 // indirect
+	k8s.io/kube-aggregator v0.28.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	k8s.io/kubelet v0.28.2 // indirect
-	k8s.io/metrics v0.28.2 // indirect
-	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230707163321-8a64e5f3bd78 // indirect
+	k8s.io/kubelet v0.28.3 // indirect
+	k8s.io/metrics v0.28.3 // indirect
+	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // indirect
 	sigs.k8s.io/controller-tools v0.13.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect