From 5c52f9aa8d7e497ab4d4e3825ff649ecafa2f4da Mon Sep 17 00:00:00 2001 From: Ayoub Nasr Date: Mon, 22 Jun 2026 17:18:47 +0200 Subject: [PATCH 1/3] operator: upgrade to v1.42.2 using upgrade-operator-sdk tool python3 tools/upgrade-operator-sdk/upgrade.py --operator-dir operator --config-dir tools/upgrade-operator-sdk/operator Scaffold realigned with operator-sdk v1.42.2 and k8s.io dependencies pinned to v0.33.13. Go toolchain stays at 1.24.13 and controller-runtime at v0.21.0, matching what kubebuilder v4.6.0 (bundled with operator-sdk v1.42.2) scaffolds. Refs: MK8S-237, MK8S-224 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- operator/Makefile | 2 +- .../scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 ++++---- operator/go.mod | 8 +++---- operator/go.sum | 24 +++++++++---------- .../upgrade-operator-sdk/operator/config.yaml | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/operator/Makefile b/operator/Makefile index 58d9b741bc..3da62ea382 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.42.1 +OPERATOR_SDK_VERSION ?= v1.42.2 # Image URL to use all building/pushing image targets IMG ?= controller:latest diff --git a/operator/config/scorecard/patches/basic.config.yaml b/operator/config/scorecard/patches/basic.config.yaml index 70e0774846..cc83239339 100644 --- a/operator/config/scorecard/patches/basic.config.yaml +++ b/operator/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: basic test: basic-check-spec-test diff --git a/operator/config/scorecard/patches/olm.config.yaml b/operator/config/scorecard/patches/olm.config.yaml index 53bbf867a5..532bcc2446 100644 --- a/operator/config/scorecard/patches/olm.config.yaml +++ b/operator/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-bundle-validation-test @@ -14,7 +14,7 @@ entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-crds-have-validation-test @@ -24,7 +24,7 @@ entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-crds-have-resources-test @@ -34,7 +34,7 @@ entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-spec-descriptors-test @@ -44,7 +44,7 @@ entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-status-descriptors-test diff --git a/operator/go.mod b/operator/go.mod index 0ff9893004..71d4dab203 100644 --- a/operator/go.mod +++ b/operator/go.mod @@ -3,13 +3,13 @@ module github.com/scality/metalk8s/operator go 1.24.0 require ( - github.com/go-logr/logr v1.4.2 + github.com/go-logr/logr v1.4.3 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.33.10 - k8s.io/apimachinery v0.33.10 - k8s.io/client-go v0.33.10 + k8s.io/api v0.33.13 + k8s.io/apimachinery v0.33.13 + k8s.io/client-go v0.33.13 sigs.k8s.io/controller-runtime v0.21.0 ) diff --git a/operator/go.sum b/operator/go.sum index b0412e642d..837222c170 100644 --- a/operator/go.sum +++ b/operator/go.sum @@ -28,8 +28,8 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= @@ -110,8 +110,8 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= @@ -128,8 +128,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -223,16 +223,16 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.33.10 h1:8OHPP+ybXl9UKq1gpqvQPvfnwDtilBqfCY3+LQl4TK4= -k8s.io/api v0.33.10/go.mod h1:pVsaVIqAFpx/8NDmICPI0VOgnIc6oZJoGCpOgXrPGxY= +k8s.io/api v0.33.13 h1:Au/I/J8SXmcCBxp+KiS82451AEaKjVHouB1x3lUm1Wk= +k8s.io/api v0.33.13/go.mod h1:XCIdoR5NWEBB8xORizkh3zBSUk4Pz5KnfnGuOesy0+k= k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs= k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc= -k8s.io/apimachinery v0.33.10 h1:XHdu/6MeJHzh7H2y31XVOL5GIYjP/tH5jcHofNYWaDc= -k8s.io/apimachinery v0.33.10/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apimachinery v0.33.13 h1:e15J9pNLORqlAQ3/D2QdXvMTHJLl0PxDhike6iNcw20= +k8s.io/apimachinery v0.33.13/go.mod h1:a8VYBaEU2Z6n2IxTG2Hs6WX5i0wQFPGyl4YFab4kn90= k8s.io/apiserver v0.33.0 h1:QqcM6c+qEEjkOODHppFXRiw/cE2zP85704YrQ9YaBbc= k8s.io/apiserver v0.33.0/go.mod h1:EixYOit0YTxt8zrO2kBU7ixAtxFce9gKGq367nFmqI8= -k8s.io/client-go v0.33.10 h1:Q3KkTB0zPnGlrs6mS2p6LaJ2zM5ehBVz0JO9ZKQied0= -k8s.io/client-go v0.33.10/go.mod h1:pEg4JnHgHR+m6tZ23SUWj+md2iPdszmVG8KD9/pHtec= +k8s.io/client-go v0.33.13 h1:gyirIFpLEF9RltmrUkkObQFkxeumU2hRcxiDsVfrf1w= +k8s.io/client-go v0.33.13/go.mod h1:JcZUgHTHDjbLaFaGVNuGmef4iqKNqOzdtwDu3RlR058= k8s.io/component-base v0.33.0 h1:Ot4PyJI+0JAD9covDhwLp9UNkUja209OzsJ4FzScBNk= k8s.io/component-base v0.33.0/go.mod h1:aXYZLbw3kihdkOPMDhWbjGCO6sg+luw554KP51t8qCU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= diff --git a/tools/upgrade-operator-sdk/operator/config.yaml b/tools/upgrade-operator-sdk/operator/config.yaml index d684c4f8a5..a6796862d2 100644 --- a/tools/upgrade-operator-sdk/operator/config.yaml +++ b/tools/upgrade-operator-sdk/operator/config.yaml @@ -1,12 +1,12 @@ repo: github.com/scality/metalk8s/operator domain: metalk8s.scality.com -operator_sdk_version: v1.42.1 +operator_sdk_version: v1.42.2 # Optional: pin versions. If absent, the script detects the latest # patch from the scaffold's go.mod and auto-pins them here. go_toolchain: go1.24.13 -k8s_libs: v0.33.10 +k8s_libs: v0.33.13 apis: - version: v1alpha1 From 167751540ad7822c80dcba00879d7d4e03c69d69 Mon Sep 17 00:00:00 2001 From: Ayoub Nasr Date: Mon, 22 Jun 2026 17:19:20 +0200 Subject: [PATCH 2/3] storage-operator: upgrade to v1.42.2 using upgrade-operator-sdk tool python3 tools/upgrade-operator-sdk/upgrade.py --operator-dir storage-operator --config-dir tools/upgrade-operator-sdk/storage-operator Scaffold realigned with operator-sdk v1.42.2 and k8s.io dependencies pinned to v0.33.13. Go toolchain stays at 1.24.13 and controller-runtime at v0.21.0, matching what kubebuilder v4.6.0 (bundled with operator-sdk v1.42.2) scaffolds. Refs: MK8S-237, MK8S-224 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- storage-operator/Makefile | 2 +- .../scorecard/patches/basic.config.yaml | 2 +- .../config/scorecard/patches/olm.config.yaml | 10 ++++---- storage-operator/go.mod | 10 ++++---- storage-operator/go.sum | 24 +++++++++---------- .../storage-operator/config.yaml | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/storage-operator/Makefile b/storage-operator/Makefile index 477c68602c..e1efa2a105 100644 --- a/storage-operator/Makefile +++ b/storage-operator/Makefile @@ -48,7 +48,7 @@ endif # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v1.42.1 +OPERATOR_SDK_VERSION ?= v1.42.2 # Image URL to use all building/pushing image targets IMG ?= controller:latest diff --git a/storage-operator/config/scorecard/patches/basic.config.yaml b/storage-operator/config/scorecard/patches/basic.config.yaml index 70e0774846..cc83239339 100644 --- a/storage-operator/config/scorecard/patches/basic.config.yaml +++ b/storage-operator/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: basic test: basic-check-spec-test diff --git a/storage-operator/config/scorecard/patches/olm.config.yaml b/storage-operator/config/scorecard/patches/olm.config.yaml index 53bbf867a5..532bcc2446 100644 --- a/storage-operator/config/scorecard/patches/olm.config.yaml +++ b/storage-operator/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-bundle-validation-test @@ -14,7 +14,7 @@ entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-crds-have-validation-test @@ -24,7 +24,7 @@ entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-crds-have-resources-test @@ -34,7 +34,7 @@ entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-spec-descriptors-test @@ -44,7 +44,7 @@ entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.42.1 + image: quay.io/operator-framework/scorecard-test:v1.42.2 labels: suite: olm test: olm-status-descriptors-test diff --git a/storage-operator/go.mod b/storage-operator/go.mod index ab5e50b651..30fa8adc46 100644 --- a/storage-operator/go.mod +++ b/storage-operator/go.mod @@ -3,14 +3,14 @@ module github.com/scality/metalk8s/storage-operator go 1.24.0 require ( - github.com/go-logr/logr v1.4.2 + github.com/go-logr/logr v1.4.3 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.10.0 - k8s.io/api v0.33.10 - k8s.io/apimachinery v0.33.10 - k8s.io/client-go v0.33.10 + github.com/stretchr/testify v1.11.1 + k8s.io/api v0.33.13 + k8s.io/apimachinery v0.33.13 + k8s.io/client-go v0.33.13 sigs.k8s.io/controller-runtime v0.21.0 ) diff --git a/storage-operator/go.sum b/storage-operator/go.sum index dc65a29f37..4bf959ca7e 100644 --- a/storage-operator/go.sum +++ b/storage-operator/go.sum @@ -28,8 +28,8 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= @@ -110,8 +110,8 @@ github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= @@ -128,8 +128,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -221,16 +221,16 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.33.10 h1:8OHPP+ybXl9UKq1gpqvQPvfnwDtilBqfCY3+LQl4TK4= -k8s.io/api v0.33.10/go.mod h1:pVsaVIqAFpx/8NDmICPI0VOgnIc6oZJoGCpOgXrPGxY= +k8s.io/api v0.33.13 h1:Au/I/J8SXmcCBxp+KiS82451AEaKjVHouB1x3lUm1Wk= +k8s.io/api v0.33.13/go.mod h1:XCIdoR5NWEBB8xORizkh3zBSUk4Pz5KnfnGuOesy0+k= k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs= k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc= -k8s.io/apimachinery v0.33.10 h1:XHdu/6MeJHzh7H2y31XVOL5GIYjP/tH5jcHofNYWaDc= -k8s.io/apimachinery v0.33.10/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apimachinery v0.33.13 h1:e15J9pNLORqlAQ3/D2QdXvMTHJLl0PxDhike6iNcw20= +k8s.io/apimachinery v0.33.13/go.mod h1:a8VYBaEU2Z6n2IxTG2Hs6WX5i0wQFPGyl4YFab4kn90= k8s.io/apiserver v0.33.0 h1:QqcM6c+qEEjkOODHppFXRiw/cE2zP85704YrQ9YaBbc= k8s.io/apiserver v0.33.0/go.mod h1:EixYOit0YTxt8zrO2kBU7ixAtxFce9gKGq367nFmqI8= -k8s.io/client-go v0.33.10 h1:Q3KkTB0zPnGlrs6mS2p6LaJ2zM5ehBVz0JO9ZKQied0= -k8s.io/client-go v0.33.10/go.mod h1:pEg4JnHgHR+m6tZ23SUWj+md2iPdszmVG8KD9/pHtec= +k8s.io/client-go v0.33.13 h1:gyirIFpLEF9RltmrUkkObQFkxeumU2hRcxiDsVfrf1w= +k8s.io/client-go v0.33.13/go.mod h1:JcZUgHTHDjbLaFaGVNuGmef4iqKNqOzdtwDu3RlR058= k8s.io/component-base v0.33.0 h1:Ot4PyJI+0JAD9covDhwLp9UNkUja209OzsJ4FzScBNk= k8s.io/component-base v0.33.0/go.mod h1:aXYZLbw3kihdkOPMDhWbjGCO6sg+luw554KP51t8qCU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= diff --git a/tools/upgrade-operator-sdk/storage-operator/config.yaml b/tools/upgrade-operator-sdk/storage-operator/config.yaml index 537cd84199..55998f8341 100644 --- a/tools/upgrade-operator-sdk/storage-operator/config.yaml +++ b/tools/upgrade-operator-sdk/storage-operator/config.yaml @@ -1,12 +1,12 @@ repo: github.com/scality/metalk8s/storage-operator domain: metalk8s.scality.com -operator_sdk_version: v1.42.1 +operator_sdk_version: v1.42.2 # Optional: pin versions. If absent, the script detects the latest # patch from the scaffold's go.mod and auto-pins them here. go_toolchain: go1.24.13 -k8s_libs: v0.33.10 +k8s_libs: v0.33.13 apis: - group: storage From 59f94f541905eb3527b68ec5ec02fb3a07581589 Mon Sep 17 00:00:00 2001 From: Ayoub Nasr Date: Mon, 22 Jun 2026 17:22:19 +0200 Subject: [PATCH 3/3] CHANGELOG: add entry for operator-sdk bump Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4621ac52a0..b55d5b7430 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,11 @@ `rockylinux:9.8-minimal` (PR[#4994](https://github.com/scality/metalk8s/pull/4994)) +- Bump operator-sdk to [v1.42.2](https://github.com/operator-framework/operator-sdk/releases/tag/v1.42.2) + for the `metalk8s-operator` and `storage-operator`, and bump their + `k8s.io/{api,apimachinery,client-go}` dependencies to v0.33.13 + (PR[#5000](https://github.com/scality/metalk8s/pull/5000)) + ## Release 133.0.12 (in development) ## Release 133.0.11