Merge pull request #470 from jakobmoellerdev/k8s-0.28.3

OCPVE-758: chore: bump deps to k8s 0.28.3 and ecosystem to latest
openshift · Oct 25, 2023 · 3b6e377 · 3b6e377
2 parents 95c9929 + 573615e
commit 3b6e377
Show file tree

Hide file tree

Showing 103 changed files with 13,697 additions and 883 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
         pass_filenames: false
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: fix-byte-order-marker
@@ -50,7 +50,7 @@ repos:
         exclude: ^vendor/
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.54.2
+    rev: v1.55.1
     hooks:
       - id: golangci-lint
         entry: golangci-lint run --fix
@@ -61,7 +61,7 @@ repos:
         language: golang
         require_serial: true
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
+    rev: v2.2.6
     hooks:
       - id: codespell
         args: [

diff --git a/Makefile b/Makefile
@@ -45,12 +45,12 @@ OPERATOR_SDK_VERSION ?= 1.32.0
 MANAGER_NAME_PREFIX ?= lvms-
 OPERATOR_NAMESPACE ?= openshift-storage
 TOPOLVM_CSI_IMAGE ?= quay.io/lvms_dev/topolvm:latest
-RBAC_PROXY_IMAGE ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
-CSI_REGISTRAR_IMAGE ?= k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2
-CSI_PROVISIONER_IMAGE ?= k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0
-CSI_LIVENESSPROBE_IMAGE ?= k8s.gcr.io/sig-storage/livenessprobe:v2.8.0
-CSI_RESIZER_IMAGE ?= k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
-CSI_SNAPSHOTTER_IMAGE ?= k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0
+RBAC_PROXY_IMAGE ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
+CSI_REGISTRAR_IMAGE ?= k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
+CSI_PROVISIONER_IMAGE ?= k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
+CSI_LIVENESSPROBE_IMAGE ?= k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
+CSI_RESIZER_IMAGE ?= k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+CSI_SNAPSHOTTER_IMAGE ?= k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
 
 define MANAGER_ENV_VARS
 OPERATOR_NAMESPACE=$(OPERATOR_NAMESPACE)
@@ -333,7 +333,7 @@ controller-gen: ## Download controller-gen locally if necessary.
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.3)
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.2.1)
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.
@@ -345,11 +345,11 @@ jsonnet: ## Download jsonnet locally if necessary.
 
 GINKGO = $(shell pwd)/bin/ginkgo
 ginkgo: ## Download ginkgo and gomega locally if necessary.
-	$(call go-get-tool,$(GINKGO),github.com/onsi/ginkgo/v2/ginkgo@v2.12.0)
+	$(call go-get-tool,$(GINKGO),github.com/onsi/ginkgo/v2/ginkgo@v2.13.0)
 
 MOCKERY = $(shell pwd)/bin/mockery
 mockery: ## Download mockery and add locally if necessary
-	$(call go-get-tool,$(MOCKERY),github.com/vektra/mockery/v2@v2.33.2)
+	$(call go-get-tool,$(MOCKERY),github.com/vektra/mockery/v2@v2.36.0)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

diff --git a/bundle/manifests/lvms-operator.clusterserviceversion.yaml b/bundle/manifests/lvms-operator.clusterserviceversion.yaml
@@ -624,17 +624,17 @@ spec:
                 - name: TOPOLVM_CSI_IMAGE
                   value: quay.io/lvms_dev/topolvm:latest
                 - name: RBAC_PROXY_IMAGE
-                  value: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
+                  value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
                 - name: CSI_LIVENESSPROBE_IMAGE
-                  value: k8s.gcr.io/sig-storage/livenessprobe:v2.8.0
+                  value: k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
                 - name: CSI_PROVISIONER_IMAGE
-                  value: k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0
+                  value: k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
                 - name: CSI_REGISTRAR_IMAGE
-                  value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2
+                  value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
                 - name: CSI_RESIZER_IMAGE
-                  value: k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+                  value: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
                 - name: CSI_SNAPSHOTTER_IMAGE
-                  value: k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0
+                  value: k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
                 - name: POD_NAMESPACE
                   valueFrom:
                     fieldRef:

diff --git a/config/default/manager_custom_env.yaml b/config/default/manager_custom_env.yaml
@@ -14,14 +14,14 @@ spec:
         - name: TOPOLVM_CSI_IMAGE
           value: quay.io/lvms_dev/topolvm:latest
         - name: RBAC_PROXY_IMAGE
-          value: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
+          value: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
         - name: CSI_LIVENESSPROBE_IMAGE
-          value: k8s.gcr.io/sig-storage/livenessprobe:v2.8.0
+          value: k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
         - name: CSI_PROVISIONER_IMAGE
-          value: k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0
+          value: k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
         - name: CSI_REGISTRAR_IMAGE
-          value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2
+          value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
         - name: CSI_RESIZER_IMAGE
-          value: k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+          value: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
         - name: CSI_SNAPSHOTTER_IMAGE
-          value: k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0
+          value: k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
diff --git a/config/manager/manager.env b/config/manager/manager.env
@@ -1,8 +1,8 @@
 OPERATOR_NAMESPACE=openshift-storage
 TOPOLVM_CSI_IMAGE=quay.io/lvms_dev/topolvm:latest
-RBAC_PROXY_IMAGE=gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
-CSI_REGISTRAR_IMAGE=k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.6.2
-CSI_PROVISIONER_IMAGE=k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0
-CSI_LIVENESSPROBE_IMAGE=k8s.gcr.io/sig-storage/livenessprobe:v2.8.0
-CSI_RESIZER_IMAGE=k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
-CSI_SNAPSHOTTER_IMAGE=k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0
+RBAC_PROXY_IMAGE=gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
+CSI_REGISTRAR_IMAGE=k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.7.0
+CSI_PROVISIONER_IMAGE=k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
+CSI_LIVENESSPROBE_IMAGE=k8s.gcr.io/sig-storage/livenessprobe:v2.9.0
+CSI_RESIZER_IMAGE=k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+CSI_SNAPSHOTTER_IMAGE=k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
diff --git a/go.mod b/go.mod
@@ -3,34 +3,34 @@ module github.com/openshift/lvm-operator
 go 1.20
 
 require (
-	github.com/aws/aws-sdk-go v1.45.11
+	github.com/aws/aws-sdk-go v1.46.3
 	github.com/go-logr/logr v1.2.4
 	github.com/go-logr/zapr v1.2.4
-	github.com/google/go-cmp v0.5.9
+	github.com/google/go-cmp v0.6.0
 	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
-	github.com/onsi/ginkgo/v2 v2.12.0
-	github.com/onsi/gomega v1.27.10
-	github.com/openshift/api v0.0.0-20230915112357-693d4b64813c
-	github.com/openshift/client-go v0.0.0-20230915115245-53bd8980dfb7
-	github.com/openshift/library-go v0.0.0-20230915122714-b753831a0dce
-	github.com/operator-framework/api v0.17.7
-	github.com/pelletier/go-toml v1.9.4
+	github.com/onsi/ginkgo/v2 v2.13.0
+	github.com/onsi/gomega v1.28.1
+	github.com/openshift/api v0.0.0-20231024194351-d294dffd7365
+	github.com/openshift/client-go v0.0.0-20231024221206-506d798bc61c
+	github.com/openshift/library-go v0.0.0-20231020125034-5a2d9fe760b3
+	github.com/operator-framework/api v0.18.0
+	github.com/pelletier/go-toml v1.9.5
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	github.com/topolvm/topolvm v0.21.0
+	github.com/topolvm/topolvm v0.22.0
 	go.uber.org/zap v1.26.0
 	gotest.tools/v3 v3.5.1
-	k8s.io/api v0.28.2
-	k8s.io/apiextensions-apiserver v0.28.2
-	k8s.io/apimachinery v0.28.2
-	k8s.io/client-go v0.28.2
-	k8s.io/component-helpers v0.28.2
+	k8s.io/api v0.28.3
+	k8s.io/apiextensions-apiserver v0.28.3
+	k8s.io/apimachinery v0.28.3
+	k8s.io/client-go v0.28.3
+	k8s.io/component-helpers v0.28.3
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/controller-runtime v0.16.2
-	sigs.k8s.io/yaml v1.3.0
+	sigs.k8s.io/controller-runtime v0.16.3
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
@@ -47,7 +47,7 @@ require (
 	github.com/cybozu-go/netutil v1.2.0 // indirect
 	github.com/cybozu-go/well v1.10.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.2 // 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/felixge/httpsnoop v1.0.3 // indirect
@@ -131,9 +131,9 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.28.2 // indirect
-	k8s.io/component-base v0.28.2 // indirect
-	k8s.io/kms v0.28.2 // indirect
+	k8s.io/apiserver v0.28.3 // indirect
+	k8s.io/component-base v0.28.3 // indirect
+	k8s.io/kms v0.28.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect