Update k8s packages (minor)

.golangci.yaml

@@ -1,105 +1,114 @@
+version: "2"
 run:
   concurrency: 4
-  deadline: 10m
 
 linters:
   enable:
-  - revive
-  - unused
-  - importas
-  - copyloopvar
-  - nilerr
-  - whitespace
+    - revive
+    - importas
+    - copyloopvar
+    - nilerr
+    - whitespace
 
-issues:
-  exclude-use-default: false
-  exclude:
-  # errcheck: Almost all programs ignore errors on these functions and in most cases it's ok
-  - Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked
-  # revive:
-  - var-naming # ((var|const|struct field|func) .* should be .*
-  - dot-imports # should not use dot imports
-  - package-comments # package comment should be of the form
-  - unexported-return # exported func .* returns unexported type .*, which can be annoying to use
-  - indent-error-flow # if block ends with a return statement, so drop this else and outdent its block
-  - "exported: (type|func) name will be used as .* by other packages, and that stutters;"
-  # typecheck:
-  - "undeclared name: `.*`"
-  - "\".*\" imported but not used"
-  # allow non-capitalized messages if they start with technical terms
-  - "structured logging message should be capitalized: \"garden(er-apiserver|er-controller-manager|er-admission-controller|er-operator|er-resource-manager|let)"
-  - "exported function SetDefaults_.* should have comment or be unexported"
-  exclude-rules:
-  - linters:
-    - staticcheck
-    text: "SA1019:" # Excludes messages where deprecated variables are used
-  exclude-files:
-  - "zz_generated\\..*\\.go$"
+  settings:
+    exclusions:
+      generated: lax
+      rules:
+      - linters:
+        - staticcheck
+        text: 'SA1019:' # Excludes messages where deprecated variables are used
+      # errcheck: Almost all programs ignore errors on these functions and in most cases it's ok
+      - path: (.+)\.go$
+        text: Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked
+      # revive:
+      - path: (.+)\.go$
+        text: var-naming # ((var|const|struct field|func) .* should be .*
+      - path: (.+)_test\.go$
+        text: dot-imports # should not use dot imports
+      - path: (.+)\.go$
+        text: package-comments # package comment should be of the form
+      - path: (.+)\.go$
+        text: unexported-return # exported func .* returns unexported type .*, which can be annoying to use
+      - path: (.+)\.go$
+        text: indent-error-flow # if block ends with a return statement, so drop this else and outdent its block
+      - path: (.+)\.go$
+        text: 'exported: (type|func) name will be used as .* by other packages, and that stutters;'
+      # typecheck:
+      - path: (.+)\.go$
+        text: 'undeclared name: `.*`'
+      - path: (.+)\.go$
+        text: '".*" imported but not used'
+      # allow non-capitalized messages if they start with technical terms
+      - path: (.+)\.go$
+        text: 'structured logging message should be capitalized: "garden(er-apiserver|er-controller-manager|er-admission-controller|er-operator|er-resource-manager|let)'
+      paths:
+      - zz_generated\..*\.go$
 
-linters-settings:
-  revive:
-    rules:
-    - name: duplicated-imports
-    - name: unused-parameter
-    - name: unreachable-code
-    - name: context-as-argument
-    - name: early-return
-    - name: exported
-  importas:
-    alias:
-      # External imported packages
-      - pkg: k8s.io/api/(\w+)/(v[\w\d]+)
-        alias: $1$2
-      - pkg: k8s.io/apimachinery/pkg/apis/(\w+)/(v[\w\d]+)
-        alias: $1$2
-      - pkg: k8s.io/apimachinery/pkg/api/([^m]\w+)
-        alias: api${1}
-      - pkg: k8s.io/apimachinery/pkg/util/(\w+)
-        alias: util${1}
-      - pkg: k8s.io/utils/clock/testing
-        alias: testclock
-      - pkg: sigs.k8s.io/controller-runtime/pkg/client/fake
-        alias: fakeclient
-      - pkg: sigs.k8s.io/controller-runtime/pkg/log/zap
-        alias: logzap
-      - pkg: sigs.k8s.io/controller-runtime/pkg/log
-        alias: logf
-      # Gardener extension package
-      - pkg: github.com/gardener/gardener/extensions/.*/(\w+)/mock$
-        alias: extensionsmock${1}
-      - pkg: github.com/gardener/gardener/extensions/pkg/apis/config
-        alias: extensionsconfig
-      - pkg: github.com/gardener/gardener/extensions/pkg/controller
-        alias: extensionscontroller
-      - pkg: github.com/gardener/gardener/extensions/pkg/predicate
-        alias: extensionspredicate
-      - pkg: github.com/gardener/gardener/extensions/pkg/controller/([^m]\w+)
-        alias: extensions${1}controller
-      - pkg: github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd
-        alias: extensionsheartbeatcmd
-      - pkg: github.com/gardener/gardener/extensions/pkg/controller/worker/helper
-        alias: extensionsworkerhelper
-      - pkg: github.com/gardener/gardener/extensions/pkg/util/secret/manager
-        alias: extensionssecretsmanager
-      - pkg: github.com/gardener/gardener/extensions/pkg/webhook
-        alias: extensionswebhook
-      - pkg: github.com/gardener/gardener/extensions/pkg/webhook/([^m]\w+)
-        alias:  extensions${1}webhook
-      # Gardener other packages
-      - pkg: github.com/gardener/gardener/pkg/api/extensions
-        alias: apiextensions
-      - pkg: github.com/gardener/gardener/pkg/apis/core
-        alias: gardencore
-      - pkg: github.com/gardener/gardener/pkg/apis/core/([\w\d]+)
-        alias: gardencore${1}
-      - pkg: github.com/gardener/gardener/pkg/apis/core/([\w\d]+)/helper
-        alias: ${1}helper
-      - pkg: github.com/gardener/gardener/pkg/apis/([^c]\w+)/([\w\d]+)
-        alias: $1$2
-      - pkg: github.com/gardener/gardener/pkg/apis/([^c]\w+)/([\w\d]+)/([\w\d]+)
-        alias: $1$2$3
-      - pkg: github.com/gardener/gardener/pkg/chartrenderer
-        alias: chartrenderer
-      # Flux APIs
-      - pkg: github.com/fluxcd/(\w+)-controller/api/([\w\d]+)
-        alias: $1$2
+    revive:
+      rules:
+      - name: duplicated-imports
+      - name: unused-parameter
+      - name: unreachable-code
+      - name: context-as-argument
+      - name: early-return
+      - name: exported
+
+    importas:
+      alias:
+        # External imported packages
+        - pkg: k8s.io/api/(\w+)/(v[\w\d]+)
+          alias: $1$2
+        - pkg: k8s.io/apimachinery/pkg/apis/(\w+)/(v[\w\d]+)
+          alias: $1$2
+        - pkg: k8s.io/apimachinery/pkg/api/([^m]\w+)
+          alias: api${1}
+        - pkg: k8s.io/apimachinery/pkg/util/(\w+)
+          alias: util${1}
+        - pkg: k8s.io/utils/clock/testing
+          alias: testclock
+        - pkg: sigs.k8s.io/controller-runtime/pkg/client/fake
+          alias: fakeclient
+        - pkg: sigs.k8s.io/controller-runtime/pkg/log/zap
+          alias: logzap
+        - pkg: sigs.k8s.io/controller-runtime/pkg/log
+          alias: logf
+        # Gardener extension package
+        - pkg: github.com/gardener/gardener/extensions/.*/(\w+)/mock$
+          alias: extensionsmock${1}
+        - pkg: github.com/gardener/gardener/extensions/pkg/apis/config
+          alias: extensionsconfig
+        - pkg: github.com/gardener/gardener/extensions/pkg/controller
+          alias: extensionscontroller
+        - pkg: github.com/gardener/gardener/extensions/pkg/predicate
+          alias: extensionspredicate
+        - pkg: github.com/gardener/gardener/extensions/pkg/controller/([^m]\w+)
+          alias: extensions${1}controller
+        - pkg: github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd
+          alias: extensionsheartbeatcmd
+        - pkg: github.com/gardener/gardener/extensions/pkg/controller/worker/helper
+          alias: extensionsworkerhelper
+        - pkg: github.com/gardener/gardener/extensions/pkg/util/secret/manager
+          alias: extensionssecretsmanager
+        - pkg: github.com/gardener/gardener/extensions/pkg/webhook
+          alias: extensionswebhook
+        - pkg: github.com/gardener/gardener/extensions/pkg/webhook/([^m]\w+)
+          alias: extensions${1}webhook
+        # Gardener other packages
+        - pkg: github.com/gardener/gardener/pkg/api/extensions
+          alias: apiextensions
+        - pkg: github.com/gardener/gardener/pkg/apis/core
+          alias: gardencore
+        - pkg: github.com/gardener/gardener/pkg/apis/core/([\w\d]+)
+          alias: gardencore${1}
+        - pkg: github.com/gardener/gardener/pkg/apis/core/([\w\d]+)/helper
+          alias: ${1}helper
+        - pkg: github.com/gardener/gardener/pkg/apis/([^c]\w+)/([\w\d]+)
+          alias: $1$2
+        - pkg: github.com/gardener/gardener/pkg/apis/([^c]\w+)/([\w\d]+)/([\w\d]+)
+          alias: $1$2$3
+        - pkg: github.com/gardener/gardener/pkg/chartrenderer
+          alias: chartrenderer
+
+formatters:
+  exclusions:
+    generated: lax

Makefile

@@ -32,11 +32,6 @@ endif
 # Tools                                 #
 #########################################
 
-# Manually update golangci-lint to the latest v1 version.
-# This unblocks the go 1.24 upgrade, which will unblock the gardener/gardener update.
-# TODO(timebertt): remove this version override when bumping the gardener/gardener dependency.
-GOLANGCI_LINT_VERSION := v1.64.8
-
 TOOLS_DIR := hack/tools
 include $(GARDENER_HACK_DIR)/tools.mk
 include $(HACK_DIR)/tools.mk

go.mod

@@ -1,13 +1,13 @@
 module github.com/stackitcloud/gardener-extension-acl
 
-go 1.23.0
+go 1.24.0
 
 toolchain go1.24.2
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
-	github.com/gardener/gardener v1.112.0
-	github.com/gardener/gardener-extension-provider-openstack v1.41.2
+	github.com/gardener/gardener v1.117.0
+	github.com/gardener/gardener-extension-provider-openstack v1.47.0
 	github.com/go-logr/logr v1.4.2
 	github.com/golang/mock v1.6.0
 	github.com/onsi/ginkgo/v2 v2.23.4
@@ -17,18 +17,18 @@ require (
 	github.com/spf13/pflag v1.0.6
 	github.com/tidwall/gjson v1.18.0
 	golang.org/x/tools v0.32.0
-	gomodules.xyz/jsonpatch/v2 v2.4.0
+	gomodules.xyz/jsonpatch/v2 v2.5.0
 	gopkg.in/yaml.v3 v3.0.1
-	istio.io/api v1.24.2
-	istio.io/client-go v1.24.2
-	k8s.io/api v0.31.5
-	k8s.io/apiextensions-apiserver v0.31.5
-	k8s.io/apimachinery v0.31.5
-	k8s.io/client-go v0.31.5
-	k8s.io/code-generator v0.31.5
-	k8s.io/component-base v0.31.5
+	istio.io/api v1.25.2
+	istio.io/client-go v1.25.1
+	k8s.io/api v0.32.3
+	k8s.io/apiextensions-apiserver v0.32.3
+	k8s.io/apimachinery v0.32.3
+	k8s.io/client-go v0.32.3
+	k8s.io/code-generator v0.32.3
+	k8s.io/component-base v0.32.3
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
-	sigs.k8s.io/controller-runtime v0.19.5
+	sigs.k8s.io/controller-runtime v0.20.4
 	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9
 )
 
@@ -42,17 +42,17 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.5 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/fluent/fluent-operator/v2 v2.9.0 // indirect
+	github.com/fluent/fluent-operator/v3 v3.3.0 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/gardener/cert-management v0.17.3 // indirect
-	github.com/gardener/etcd-druid v0.26.1 // indirect
-	github.com/gardener/machine-controller-manager v0.56.0 // indirect
+	github.com/gardener/cert-management v0.17.5 // indirect
+	github.com/gardener/etcd-druid/api v0.29.0 // indirect
+	github.com/gardener/machine-controller-manager v0.57.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/errors v0.22.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -62,8 +62,8 @@ require (
 	github.com/gobuffalo/flect v1.0.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/btree v1.1.3 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -73,14 +73,12 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/ironcore-dev/vgopath v0.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -91,15 +89,15 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.2 // indirect
-	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.81.0 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/spf13/afero v1.12.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
+	github.com/spf13/afero v1.14.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
@@ -111,31 +109,32 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.37.0 // indirect
-	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
+	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/oauth2 v0.25.0 // indirect
+	golang.org/x/oauth2 v0.28.0 // indirect
 	golang.org/x/sync v0.13.0 // indirect
 	golang.org/x/sys v0.32.0 // indirect
 	golang.org/x/term v0.31.0 // indirect
 	golang.org/x/text v0.24.0 // indirect
-	golang.org/x/time v0.10.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	helm.sh/helm/v3 v3.16.4 // indirect
+	helm.sh/helm/v3 v3.17.3 // indirect
 	k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e // indirect
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
-	k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
 	k8s.io/klog v1.0.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-aggregator v0.31.5 // indirect
-	k8s.io/kube-openapi v0.0.0-20241127205056-99599406b04f // indirect
-	k8s.io/kubelet v0.31.5 // indirect
-	k8s.io/metrics v0.31.5 // indirect
-	sigs.k8s.io/controller-tools v0.16.5 // indirect
+	k8s.io/kube-aggregator v0.32.3 // indirect
+	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
+	k8s.io/kubelet v0.32.3 // indirect
+	k8s.io/metrics v0.32.3 // indirect
+	sigs.k8s.io/controller-tools v0.17.3 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )