Compatibility with g/g 1.89 GNA (#46)

.github/workflows/docker.yaml

@@ -38,7 +38,7 @@ jobs:
         cache: false
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v4
+      uses: golangci/golangci-lint-action@v6
       with:
         args: --build-tags integration -p bugs -p unused -D protogetter --timeout=5m
 

.github/workflows/release-drafter.yaml

@@ -10,6 +10,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: release-drafter/release-drafter@v5
+    - uses: release-drafter/release-drafter@v6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yaml

@@ -0,0 +1,31 @@
+---
+name: Test Action
+on:
+  pull_request:
+    branches:
+      - master
+  release:
+    types:
+      - published
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Test Build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up Go 1.22
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.22.x'
+
+    - name: Check (lint) and Test
+      run: |
+        mkdir -p hack/tools/bin
+        make test-in-docker

.golangci.yaml

@@ -0,0 +1,7 @@
+run:
+  concurrency: 4
+  deadline: 10m
+
+linters:
+  disable:
+  - unused

Makefile

@@ -58,10 +58,14 @@ install: revendor $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(MOCK
 	@LD_FLAGS="-w -X github.com/gardener/$(EXTENSION_PREFIX)-$(NAME)/pkg/version.Version=$(VERSION)" \
 	$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/install.sh ./...
 
+.PHONY: tidy
+tidy:
+	@GO111MODULE=on go mod tidy
+
 .PHONY: revendor
 revendor:
-	@GO111MODULE=on go mod vendor
 	@GO111MODULE=on go mod tidy
+	@GO111MODULE=on go mod vendor
 	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/*
 	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/.ci/*
 
@@ -76,6 +80,28 @@ generate-in-docker: revendor $(HELM) $(YQ)
 				&& make generate \
 				&& chown -R $(shell id -u):$(shell id -g) ."
 
+.PHONY: check-generate
+check-generate:
+	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-generate.sh $(REPO_ROOT)
+
+.PHONY: check
+check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
+	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/...
+	@$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check-charts.sh ./charts
+
+.PHONY: test
+test:
+	@SKIP_FETCH_TOOLS=1 $(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/test.sh ./cmd/... ./pkg/...
+
+.PHONY: test-in-docker
+test-in-docker: revendor
+	docker run --rm -i$(DOCKER_TTY_ARG) \
+		--user $$(id -u):$$(id -g) \
+		--mount type=tmpfs,destination=/.cache \
+		--volume $(PWD):/go/src/github.com/metal-stack/os-metal-extension golang:$(GO_VERSION) \
+			sh -c "cd /go/src/github.com/metal-stack/os-metal-extension \
+					&& make install check test"
+
 .PHONY: docker-image
 docker-image:
 	@docker build --build-arg VERIFY=$(VERIFY) -t $(IMAGE_PREFIX)/os-metal-extension:$(IMAGE_TAG) -f Dockerfile .

charts/os-metal/values.yaml

@@ -12,3 +12,7 @@ controllers:
     renewIntervalSeconds: 30
 
 disableControllers: []
+
+gardener:
+  gardenlet:
+    featureGates: {}

cmd/app/app.go

@@ -20,34 +20,24 @@ import (
 	"os"
 
 	extcontroller "github.com/gardener/gardener/extensions/pkg/controller"
-	corev1 "k8s.io/api/core/v1"
-	componentbaseconfig "k8s.io/component-base/config"
-
 	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/metal-stack/os-metal-extension/pkg/generator"
 	"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/metal-stack/os-metal-extension/pkg/controller/operatingsystemconfig"
 )
 
 const ctrlName = "os-metal"
 
-var osTypes = []string{"ubuntu", "debian", "nvidia"}
-
 // NewControllerCommand returns a new Command with a new Generator
 func NewControllerCommand(ctx context.Context) *cobra.Command {
-	g := generator.IgnitionGenerator()
-	if g == 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{}
@@ -68,7 +58,10 @@ func NewControllerCommand(ctx context.Context) *cobra.Command {
 
 		reconcileOpts = &controllercmd.ReconcilerOptions{}
 
-		controllerSwitches = oscommoncmd.SwitchOptions(ctrlName, osTypes, g)
+		controllerSwitches = controllercmd.NewSwitchOptions(
+			controllercmd.Switch(osccontroller.ControllerName, operatingsystemconfig.AddToManager),
+			controllercmd.Switch(heartbeat.ControllerName, heartbeat.AddToManager),
+		)
 
 		aggOption = controllercmd.NewOptionAggregator(
 			generalOpts,
@@ -115,10 +108,10 @@ 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)
 
 			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-metal
 type: helm
 providerConfig:
-  chart: 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
+  chart: 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
   values:
     image:
       tag: 0.0.1