Skip to content

Commit cc098b5

Browse files
silvacarlosssilvacarloss
authored
Merge branch 'kubernetes:master' into support-multiple-share-rules-manila-csi
2 parents 978dd3d + 41a6359 commit cc098b5

File tree

28 files changed

+370
-111
lines changed

28 files changed

+370
-111
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.24.3
17+
ARG GOLANG_IMAGE=golang:1.24.5
1818

1919
# The distroless image on which the CPI manager image is built.
2020
#
2121
# Please do not use "latest". Explicit tags should be used to provide
2222
# deterministic builds. Follow what kubernetes uses to build
2323
# kube-controller-manager, for example for 1.27.x:
2424
# https://github.com/kubernetes/kubernetes/blob/release-1.27/build/common.sh#L99
25-
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.3-bookworm.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.24.5-bookworm.0
2626

2727
# We use Alpine as the source for default CA certificates and some output
2828
# images
29-
ARG ALPINE_IMAGE=alpine:3.21.2
29+
ARG ALPINE_IMAGE=alpine:3.21.4
3030

3131
# cinder-csi-plugin uses Debian as a base image
3232
ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ build-local-image-%:
166166
.
167167

168168
# Build all images locally
169-
build-local-images: $(addprefix build-image-,$(IMAGE_NAMES))
169+
build-local-images: $(addprefix build-local-image-,$(IMAGE_NAMES))
170170

171171
# Build a single image for all architectures in ARCHS and push it to REGISTRY
172172
push-multiarch-image-%:

‎OWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ approvers:
1111
reviewers:
1212
- dulek
1313
- kayrus
14-
- mdbooth
1514
- stephenfin
1615
- zetaab

‎cloudbuild.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ options:
99
substitution_option: ALLOW_LOOSE
1010
machineType: 'N1_HIGHCPU_8'
1111
steps:
12-
- name: gcr.io/k8s-testimages/gcb-docker-gcloud
12+
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud
1313
entrypoint: bash
1414
env:
1515
# default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx

‎docs/release-procedure.md‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ critical bug fixes.
1616
2. Update the minor version with the expected version.
1717

1818
Make changes in the `docs/manifests/tests/examples` directories using the
19-
`hack/bump_release.sh` script by running the following command:
19+
`hack/bump-release.sh` script by running the following command:
2020

2121
```bash
2222
$ hack/bump-release.sh 28 29 0
2323
```
2424

25-
This will replace `1.28.x`/`2.28.x` with `1.29.0`/`2.29.0` strings in the
25+
This will replace `1.28.x` with `1.29.0` strings in the
2626
`docs/manifests/tests/examples` directories. Ensure that you double-check the
2727
diff before committing the changes. Non-related changes must not be shipped.
2828

@@ -43,8 +43,32 @@ critical bug fixes.
4343

4444
6. Make PR modifying [images.yaml](https://github.com/kubernetes/k8s.io/blob/main/registry.k8s.io/images/k8s-staging-provider-os/images.yaml) to promote gcr.io images to registry.k8s.io. The point is to copy the proper image sha256 hashes from the staging repository to the images.yaml.
4545

46-
7. Once images are promoted create release notes using the "Generate release notes" button in the GitHub "New release" UI and publish the release.
46+
Use `hack/release-image-digests.sh` script and `hack/verify-image-digests.sh` to verify the digests before submitting the PR.
47+
48+
```bash
49+
$ ./hack/release-image-digests.sh ../k8s.io/registry.k8s.io/images/k8s-staging-provider-os/images.yaml vX.Y.Z
50+
```
51+
52+
Generate a PR with the updated `images.yaml` file. Make sure to review the changes and ensure that the correct images are being promoted.
53+
54+
7. Once images are promoted (takes about 30 minutes) create release notes using the "Generate release notes" button in the GitHub "New release" UI and publish the release.
55+
56+
8. Update the helm chart version with the expected version.
57+
58+
Make changes in the `charts` directory using the
59+
`hack/bump-release.sh` script by running the following command:
60+
61+
```bash
62+
$ hack/bump-charts.sh 28 29 0
63+
```
64+
65+
This will replace `1.28.x`/`2.28.x` with `1.29.0`/`2.29.0` strings in the
66+
`docs/manifests/tests/examples` directories. Ensure that you double-check the
67+
diff before committing the changes. Non-related changes must not be shipped.
68+
69+
Make a PR to bump the chart version in the `charts` directory. Once the PR is
70+
merged, the chart will be automatically published to the repository registry.
4771

48-
8. Update `kubernetes/test-infra` to add jobs for the new release branch in the [`config/jobs/kubernetes/cloud-provider-openstack`](https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes/cloud-provider-openstack) directory.
72+
9. Update `kubernetes/test-infra` to add jobs for the new release branch in the [`config/jobs/kubernetes/cloud-provider-openstack`](https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes/cloud-provider-openstack) directory.
4973

5074
This is generally as simple as copying the `release-master` file to `release-X.Y`, adding `--release-XY` suffixes to the job names and `testgrid-tab-name` annotations, and updating the branch specifiers.

‎go.mod‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ module k8s.io/cloud-provider-openstack
22

33
go 1.24.0
44

5-
toolchain go1.24.3
5+
toolchain go1.24.5
66

77
require (
88
github.com/container-storage-interface/spec v1.11.0
99
github.com/go-chi/chi/v5 v5.2.2
1010
github.com/google/uuid v1.6.0
11-
github.com/gophercloud/gophercloud/v2 v2.5.0
11+
github.com/gophercloud/gophercloud/v2 v2.7.0
1212
github.com/gophercloud/utils/v2 v2.0.0-20250212084022-725b94822eeb
1313
github.com/hashicorp/go-version v1.7.0
1414
github.com/kubernetes-csi/csi-lib-utils v0.20.0
@@ -31,33 +31,33 @@ require (
3131
gopkg.in/gcfg.v1 v1.2.3
3232
gopkg.in/godo.v2 v2.0.9
3333
gopkg.in/yaml.v2 v2.4.0
34-
k8s.io/api v0.33.2
35-
k8s.io/apimachinery v0.33.2
36-
k8s.io/apiserver v0.33.2
37-
k8s.io/client-go v0.33.2
38-
k8s.io/cloud-provider v0.33.2
39-
k8s.io/component-base v0.33.2
34+
k8s.io/api v0.33.3
35+
k8s.io/apimachinery v0.33.3
36+
k8s.io/apiserver v0.33.3
37+
k8s.io/client-go v0.33.3
38+
k8s.io/cloud-provider v0.33.3
39+
k8s.io/component-base v0.33.3
4040
k8s.io/klog/v2 v2.130.1
41-
k8s.io/kms v0.33.2
42-
k8s.io/kubernetes v1.33.2
43-
k8s.io/mount-utils v0.33.2
41+
k8s.io/kms v0.33.3
42+
k8s.io/kubernetes v1.33.3
43+
k8s.io/mount-utils v0.33.3
4444
k8s.io/utils v0.0.0-20241210054802-24370beab758
4545
software.sslmate.com/src/go-pkcs12 v0.5.0
4646
)
4747

4848
// the below fixes the "go list -m all" execution
4949
replace (
50-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.2
51-
k8s.io/cri-client => k8s.io/cri-client v0.33.2
52-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.2
53-
k8s.io/endpointslice => k8s.io/endpointslice v0.33.2
54-
k8s.io/externaljwt => k8s.io/externaljwt v0.33.2
55-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.2
56-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.2
57-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.2
58-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2
59-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.2
60-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.2
50+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.3
51+
k8s.io/cri-client => k8s.io/cri-client v0.33.3
52+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.3
53+
k8s.io/endpointslice => k8s.io/endpointslice v0.33.3
54+
k8s.io/externaljwt => k8s.io/externaljwt v0.33.3
55+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.3
56+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.3
57+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.3
58+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.3
59+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.33.3
60+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.3
6161
)
6262

6363
require (
@@ -177,18 +177,18 @@ require (
177177
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
178178
gopkg.in/warnings.v0 v0.1.2 // indirect
179179
gopkg.in/yaml.v3 v3.0.1 // indirect
180-
k8s.io/apiextensions-apiserver v0.33.2 // indirect
181-
k8s.io/component-helpers v0.33.2 // indirect
182-
k8s.io/controller-manager v0.33.2 // indirect
183-
k8s.io/cri-api v0.33.2 // indirect
184-
k8s.io/cri-client v0.33.2 // indirect
185-
k8s.io/csi-translation-lib v0.33.2 // indirect
186-
k8s.io/dynamic-resource-allocation v0.33.2 // indirect
180+
k8s.io/apiextensions-apiserver v0.33.3 // indirect
181+
k8s.io/component-helpers v0.33.3 // indirect
182+
k8s.io/controller-manager v0.33.3 // indirect
183+
k8s.io/cri-api v0.33.3 // indirect
184+
k8s.io/cri-client v0.33.3 // indirect
185+
k8s.io/csi-translation-lib v0.33.3 // indirect
186+
k8s.io/dynamic-resource-allocation v0.33.3 // indirect
187187
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
188-
k8s.io/kube-scheduler v0.33.2 // indirect
189-
k8s.io/kubectl v0.33.2 // indirect
190-
k8s.io/kubelet v0.33.2 // indirect
191-
k8s.io/pod-security-admission v0.33.2 // indirect
188+
k8s.io/kube-scheduler v0.33.3 // indirect
189+
k8s.io/kubectl v0.33.3 // indirect
190+
k8s.io/kubelet v0.33.3 // indirect
191+
k8s.io/pod-security-admission v0.33.3 // indirect
192192
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
193193
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
194194
sigs.k8s.io/randfill v1.0.0 // indirect

‎go.sum‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
170170
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
171171
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
172172
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
173-
github.com/gophercloud/gophercloud/v2 v2.5.0 h1:DubPfC43gsZiGZ9LT1IJflVMm+0rck0ejoPsH8D5rqk=
174-
github.com/gophercloud/gophercloud/v2 v2.5.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
173+
github.com/gophercloud/gophercloud/v2 v2.7.0 h1:o0m4kgVcPgHlcXiWAjoVxGd8QCmvM5VU+YM71pFbn0E=
174+
github.com/gophercloud/gophercloud/v2 v2.7.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
175175
github.com/gophercloud/utils/v2 v2.0.0-20250212084022-725b94822eeb h1:TQTXVYXL3d0zRAybRUKKboO0z/XAsXEfU6Oax8n00kc=
176176
github.com/gophercloud/utils/v2 v2.0.0-20250212084022-725b94822eeb/go.mod h1:tIUw/gFHOB6lFV9LhzNZg5jfCLYMxI2lC1dZUa7NlHM=
177177
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
@@ -558,51 +558,51 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
558558
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
559559
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
560560
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
561-
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
562-
k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
563-
k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
564-
k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
565-
k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
566-
k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
567-
k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
568-
k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
569-
k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
570-
k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
571-
k8s.io/cloud-provider v0.33.2 h1:tP/18SbhytAapqg2/tGD5PFUR6VLYra+QfJ7Qn3FN34=
572-
k8s.io/cloud-provider v0.33.2/go.mod h1:yS8ArLLLZV1+Tv6hkSYrZuYEVz+wQgiekUtaqe9Wxao=
573-
k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
574-
k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
575-
k8s.io/component-helpers v0.33.2 h1:AjCtYzst11NV8ensxV/2LEEXRwctqS7Bs44bje9Qcnw=
576-
k8s.io/component-helpers v0.33.2/go.mod h1:PsPpiCk74n8pGWp1d6kjK/iSKBTyQfIacv02BNkMenU=
577-
k8s.io/controller-manager v0.33.2 h1:HIs8PbdTOaY6wTOvKKLwoAHSO6GeDjmYS0Gjnd6rF+c=
578-
k8s.io/controller-manager v0.33.2/go.mod h1:n8maAdN06E3cD0h5N0wuYBv9Qi9FePl7y6Iz3pfc9PY=
579-
k8s.io/cri-api v0.33.2 h1:1OiWm6gUx7JrN+xqxMzGDCPfPxVT8b6n7B6SeYl5luM=
580-
k8s.io/cri-api v0.33.2/go.mod h1:OLQvT45OpIA+tv91ZrpuFIGY+Y2Ho23poS7n115Aocs=
581-
k8s.io/cri-client v0.33.2 h1:EostRehqo+XunR5soCzsa1uX55T0DaZ7H5q9wfMvIVE=
582-
k8s.io/cri-client v0.33.2/go.mod h1:tQ9LvA9X88+fzGu+vAKUs7ITkB5O4ng6lHnezSZVl90=
583-
k8s.io/csi-translation-lib v0.33.2 h1:QyWkVcf0rbNjc53uAqCyl9kmHCRn1O0Z4QT69y/jwHQ=
584-
k8s.io/csi-translation-lib v0.33.2/go.mod h1:nFPX6BA20EDdIQpitb6p2wVtvLBuXsmm6D1Cwi3rDnE=
585-
k8s.io/dynamic-resource-allocation v0.33.2 h1:dG5HmIveq5wl3bTEJrtkZfIeGcfVGlZ1ysuzOovXOqk=
586-
k8s.io/dynamic-resource-allocation v0.33.2/go.mod h1:/q49Z4qw3mpRB77Cgl2ACTLS9xrR7U82wZvsFl3biuE=
561+
k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
562+
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
563+
k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
564+
k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
565+
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
566+
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
567+
k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
568+
k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
569+
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
570+
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
571+
k8s.io/cloud-provider v0.33.3 h1:HzpZh0W0MJoLkMGYrMjkHbwcGFIZxitgMf4utAwfPEY=
572+
k8s.io/cloud-provider v0.33.3/go.mod h1:KcXaoYCJtTTiP+8IIEHcJDpvg0QzW67+FGWpgkOteDU=
573+
k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
574+
k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
575+
k8s.io/component-helpers v0.33.3 h1:fjWVORSQfI0WKzPeIFSju/gMD9sybwXBJ7oPbqQu6eM=
576+
k8s.io/component-helpers v0.33.3/go.mod h1:7iwv+Y9Guw6X4RrnNQOyQlXcvJrVjPveHVqUA5dm31c=
577+
k8s.io/controller-manager v0.33.3 h1:OItg5te3ixRw9MFko5KW2ed4ogBbwnJfrS4mCXixbsg=
578+
k8s.io/controller-manager v0.33.3/go.mod h1:sH/I5CXliIc+3bnEjdalgSTJ/3fJhIHrDA3sOwTNgxM=
579+
k8s.io/cri-api v0.33.3 h1:aQvK3UxsaVMul4z71lOiblMHdhw9ROaw3Cgg15xDrD4=
580+
k8s.io/cri-api v0.33.3/go.mod h1:OLQvT45OpIA+tv91ZrpuFIGY+Y2Ho23poS7n115Aocs=
581+
k8s.io/cri-client v0.33.3 h1:uzgRDZoQMoF0B4cnHsglOmeak/Gz60AD408oG1OSJgQ=
582+
k8s.io/cri-client v0.33.3/go.mod h1:r1p300+uHBQ5VLvycKb73KI/XdQzECkLsNM/0Ly6oXE=
583+
k8s.io/csi-translation-lib v0.33.3 h1:lPbtBKjrqDYSkZBEACrg+dXZZTHOwmQxrUc19EQD9z0=
584+
k8s.io/csi-translation-lib v0.33.3/go.mod h1:GUIFfrXyiHE1U2OvWidQ2qD45rant3FTfB1Og+6IZFM=
585+
k8s.io/dynamic-resource-allocation v0.33.3 h1:NeWzn5mkDjyHmxRmVgEBi4qA5b/r7Ie2jqcR4t21Z+Q=
586+
k8s.io/dynamic-resource-allocation v0.33.3/go.mod h1:YU6axYSVf1vC2OnPB8PjG5KipqoxyAKUGXB7HvRxvTk=
587587
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
588588
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
589589
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
590-
k8s.io/kms v0.33.2 h1:GFwNXX4CZGQCg9DPOaJi1/+iKidCtB9/OIAGdzRo8FI=
591-
k8s.io/kms v0.33.2/go.mod h1:C1I8mjFFBNzfUZXYt9FZVJ8MJl7ynFbGgZFbBzkBJ3E=
590+
k8s.io/kms v0.33.3 h1:7cQWC+GSH211NgY8LRKjBXNtkzra5SkpYzeZrOt5D+8=
591+
k8s.io/kms v0.33.3/go.mod h1:C1I8mjFFBNzfUZXYt9FZVJ8MJl7ynFbGgZFbBzkBJ3E=
592592
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
593593
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
594-
k8s.io/kube-scheduler v0.33.2 h1:B6W7oldVnH6aIGAxh7HNHIV2YoPOoAUzqzlzUJsg/B0=
595-
k8s.io/kube-scheduler v0.33.2/go.mod h1:+1TrLmFINNQdEKGtxkgs0KY/5vDeOYIpiysMcVHwjls=
596-
k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
597-
k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
598-
k8s.io/kubelet v0.33.2 h1:wxEau5/563oJb3j3KfrCKlNWWx35YlSgDLOYUBCQ0pg=
599-
k8s.io/kubelet v0.33.2/go.mod h1:way8VCDTUMiX1HTOvJv7M3xS/xNysJI6qh7TOqMe5KM=
600-
k8s.io/kubernetes v1.33.2 h1:Vk3hsCaazyMQ6CXhu029AEPlBoYsEnD8oEIC0bP2pWQ=
601-
k8s.io/kubernetes v1.33.2/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00=
602-
k8s.io/mount-utils v0.33.2 h1:mZAFhoGs/MwJziVlUpA072vqMhXRc0LGl/W3wybLP20=
603-
k8s.io/mount-utils v0.33.2/go.mod h1:1JR4rKymg8B8bCPo618hpSAdrpO6XLh0Acqok/xVwPE=
604-
k8s.io/pod-security-admission v0.33.2 h1:XRm2Q50aFtB61qVG1Fqyn3sw1A4RaFL4HRzF3LOAq/M=
605-
k8s.io/pod-security-admission v0.33.2/go.mod h1:e6wsjnmzRbmdp6JWoXJeXqQ1iex5N4h2dke/TH1Jros=
594+
k8s.io/kube-scheduler v0.33.3 h1:CQKQ5D8aQDA/v2FQ8RSJdldIlZSVUlUQG7exBeJASXc=
595+
k8s.io/kube-scheduler v0.33.3/go.mod h1:8PYkDZE7SFRdfGGjyEREpSoJgh6sCRZ9Rx45HKCcsZ8=
596+
k8s.io/kubectl v0.33.3 h1:r/phHvH1iU7gO/l7tTjQk2K01ER7/OAJi8uFHHyWSac=
597+
k8s.io/kubectl v0.33.3/go.mod h1:euj2bG56L6kUGOE/ckZbCoudPwuj4Kud7BR0GzyNiT0=
598+
k8s.io/kubelet v0.33.3 h1:Cvy8+7Lq9saZds2ib7YBXbKvkMMJu3f5mzucmhSIJno=
599+
k8s.io/kubelet v0.33.3/go.mod h1:Q1Cfr6VQq1m9v9XsE/mDmhTxPdN6NPU6Ug0e6mAqi58=
600+
k8s.io/kubernetes v1.33.3 h1:dBx5Z2ZhR8kNzAwCoCz4j1niUbUrNUDVxeSj4/Ienu0=
601+
k8s.io/kubernetes v1.33.3/go.mod h1:nrt8sldmckKz2fCZhgRX3SKfS2e+CzXATPv6ITNkU00=
602+
k8s.io/mount-utils v0.33.3 h1:Q1jsnqdS4LdtJSYSXgiQv/XNrRHQncLk3gMYjKNSZrE=
603+
k8s.io/mount-utils v0.33.3/go.mod h1:1JR4rKymg8B8bCPo618hpSAdrpO6XLh0Acqok/xVwPE=
604+
k8s.io/pod-security-admission v0.33.3 h1:QjpEeaWV8hzCDq8YEtNmKOKlG6dARMK3zTZ98m3OYVI=
605+
k8s.io/pod-security-admission v0.33.3/go.mod h1:GhVxV5tSx0HlclRcEd00Y5idzagPgqYo5GvWC8QEkX4=
606606
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
607607
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
608608
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=

‎hack/bump-charts.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/sh
2+
3+
# Copyright 2025 The Kubernetes Authors.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
FROM_MAJOR="${1:?FROM_MAJOR (1st arg) not set or empty}"
18+
TO_MAJOR="${2:?TO_MAJOR (2nd arg) not set or empty}"
19+
TO_MINOR="${3:?TO_MINOR (3rd arg) not set or empty}"
20+
21+
# example usage: hack/bump-release.sh 28 28 1
22+
# should replace 1.28.x with 1.28.1 / 2.28.x with 2.28.1
23+
24+
find charts -type f -exec sed -i -re 's/((ersion)?: ?v?)?([1-2]\.)'${FROM_MAJOR}'\.([0-9][0-9a-zA-Z.-]*)/\1\3'${TO_MAJOR}'.'${TO_MINOR}'/g' "{}" \;

‎hack/bump-release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ TO_MINOR="${3:?TO_MINOR (3rd arg) not set or empty}"
2121
# example usage: hack/bump-release.sh 28 28 1
2222
# should replace 1.28.x with 1.28.1 / 2.28.x with 2.28.1
2323

24-
find charts docs manifests tests examples -type f -exec sed -i -re 's/((ersion)?: ?v?)?([1-2]\.)'${FROM_MAJOR}'\.([0-9][0-9a-zA-Z.-]*)/\1\3'${TO_MAJOR}'.'${TO_MINOR}'/g' "{}" \;
24+
find docs manifests tests examples -type f -exec sed -i -re 's/((ersion)?: ?v?)?([1-2]\.)'${FROM_MAJOR}'\.([0-9][0-9a-zA-Z.-]*)/\1\3'${TO_MAJOR}'.'${TO_MINOR}'/g' "{}" \;

0 commit comments

Comments
 (0)