Remove deprecated kubebuilder config (#205)

.github/workflows/chart.yaml

@@ -54,14 +54,14 @@ jobs:
           cat ./charts/${{ steps.name.outputs.name }}/values.yaml
 
       - name: Save Chart Metadata
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: chart-metadata
           path: |
             ./charts/${{ steps.name.outputs.name }}/Chart.yaml
 
       - name: Save Chart Values
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v3
         with:
           name: chart-values
           path: |

.github/workflows/image.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go environment
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
@@ -125,8 +125,8 @@ jobs:
           registry: ${{ env.GHCR_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/setup-buildx-action@v2
-      - uses: docker/metadata-action@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/metadata-action@v5
         id: metadata
         with:
           images: |
@@ -140,7 +140,7 @@ jobs:
             type=semver,pattern=v{{major}}
             type=sha
             type=raw,value=${{ needs.meta.outputs.version }}
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.ref == 'refs/heads/main' }}

.tool-versions

@@ -1 +1 @@
-golang 1.20.7
+golang 1.21.1

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 ARG TARGETOS
 ARG TARGETARCH
 

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= ghcr.io/nais/unleasherator:main
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.28.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

api/v1/remoteunleash_types_test.go

@@ -10,6 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -19,6 +20,16 @@ type mockClient struct {
 	mock.Mock
 }
 
+// GroupVersionKindFor implements client.Client.
+func (*mockClient) GroupVersionKindFor(obj runtime.Object) (schema.GroupVersionKind, error) {
+	panic("unimplemented")
+}
+
+// IsObjectNamespaced implements client.Client.
+func (*mockClient) IsObjectNamespaced(obj runtime.Object) (bool, error) {
+	panic("unimplemented")
+}
+
 func (m *mockClient) Get(ctx context.Context, key types.NamespacedName, obj client.Object, opts ...client.GetOption) error {
 	args := m.Called(ctx, key, obj, opts)
 	return args.Error(0)

charts/unleasherator/templates/deployment.yaml

@@ -39,8 +39,7 @@ spec:
                 values:
                 - linux
       containers:
-      - args: {{- toYaml .Values.controllerManager.manager.args | nindent 8 }}
-        command:
+      - command:
         - /manager
         env:
         - name: API_TOKEN_NAME_SUFFIX
@@ -68,6 +67,18 @@ spec:
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: {{ quote .Values.controllerManager.manager.env.googleApplicationCredentials
             }}
+        - name: HEALTH_PROBE_BIND_ADDRESS
+          value: {{ quote .Values.controllerManager.manager.env.healthProbeBindAddress
+            }}
+        - name: METRICS_BIND_ADDRESS
+          value: {{ quote .Values.controllerManager.manager.env.metricsBindAddress }}
+        - name: WEBHOOK_PORT
+          value: {{ quote .Values.controllerManager.manager.env.webhookPort }}
+        - name: LEADER_ELECTION_ENABLED
+          value: {{ quote .Values.controllerManager.manager.env.leaderElectionEnabled }}
+        - name: LEADER_ELECTION_RESOURCE_NAME
+          value: {{ quote .Values.controllerManager.manager.env.leaderElectionResourceName
+            }}
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
         image: {{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag
@@ -91,9 +102,6 @@ spec:
         securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext
           | nindent 10 }}
         volumeMounts:
-        - mountPath: /controller_manager_config.yaml
-          name: manager-config
-          subPath: controller_manager_config.yaml
         - mountPath: /var/secrets/google
           name: controller-manager-gcp
           readOnly: true
@@ -119,9 +127,6 @@ spec:
       serviceAccountName: {{ include "unleasherator.fullname" . }}-controller-manager
       terminationGracePeriodSeconds: 10
       volumes:
-      - configMap:
-          name: {{ include "unleasherator.fullname" . }}-manager-config
-        name: manager-config
       - name: controller-manager-gcp
         secret:
           items:

charts/unleasherator/values.yaml

@@ -23,8 +23,6 @@ controllerManager:
         cpu: 5m
         memory: 64Mi
   manager:
-    args:
-    - --config=controller_manager_config.yaml
     containerSecurityContext:
       allowPrivilegeEscalation: false
       capabilities:
@@ -40,8 +38,13 @@ controllerManager:
       federationPubsubSubscription: ""
       federationPubsubTopic: ""
       googleApplicationCredentials: ""
+      healthProbeBindAddress: :8081
       httpsProxy: ""
+      leaderElectionEnabled: "true"
+      leaderElectionResourceName: 509984d3.nais.io
+      metricsBindAddress: 127.0.0.1:8080
       noProxy: ""
+      webhookPort: "9443"
     image:
       repository: ghcr.io/nais/unleasherator
       tag: main
@@ -58,37 +61,6 @@ controllerManager:
 controllerManagerGcp:
   serviceAccountCredentialsJson: ""
 kubernetesClusterDomain: cluster.local
-managerConfig:
-  controllerManagerConfigYaml: |-
-    apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
-    kind: ControllerManagerConfig
-    metadata:
-      labels:
-        app.kubernetes.io/name: controllermanagerconfig
-        app.kubernetes.io/instance: controller-manager-configuration
-        app.kubernetes.io/component: manager
-        app.kubernetes.io/created-by: unleasherator
-        app.kubernetes.io/part-of: unleasherator
-        app.kubernetes.io/managed-by: kustomize
-    health:
-      healthProbeBindAddress: :8081
-    metrics:
-      bindAddress: 127.0.0.1:8080
-    webhook:
-      port: 9443
-    leaderElection:
-      leaderElect: true
-      resourceName: 509984d3.nais.io
-    # leaderElectionReleaseOnCancel defines if the leader should step down volume
-    # when the Manager ends. This requires the binary to immediately end when the
-    # Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-    # speeds up voluntary leader transitions as the new leader don't have to wait
-    # LeaseDuration time first.
-    # In the default scaffold provided, the program ends immediately after
-    # the manager stops, so would be fine to enable this option. However,
-    # if you are doing or is intended to do any operation such as perform cleanups
-    # after the manager stops then its usage might be unsafe.
-    # leaderElectionReleaseOnCancel: true
 metricsService:
   ports:
   - name: https

cmd/main.go

@@ -37,11 +37,6 @@ func init() {
 }
 
 func main() {
-	var configFile string
-	flag.StringVar(&configFile, "config", "",
-		"The controller will load its initial configuration from this file. "+
-			"Omit this flag to use the default configuration values. "+
-			"Command-line flags override configuration from this file.")
 	opts := zap.Options{
 		Development: true,
 	}
@@ -62,14 +57,7 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
-	options := ctrl.Options{Scheme: scheme}
-	if configFile != "" {
-		options, err = options.AndFrom(ctrl.ConfigFile().AtPath(configFile))
-		if err != nil {
-			setupLog.Error(err, "unable to load the config file")
-			os.Exit(1)
-		}
-	}
+	options := cfg.ManagerOptions(scheme)
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), options)
 	if err != nil {