Skip to content

Commit 52805dc

Browse files
hakmanhakman
authored
Release 1.32.4 (#18094)
1 parent 77e3097 commit 52805dc

File tree

509 files changed

+1340
-1340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

509 files changed

+1340
-1340
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
6666
# We lock the versions of our controllers also
6767
# We need to keep in sync with:
6868
# pkg/model/components/etcdmanager/model.go
69-
KOPS_UTILS_CP_TAG=1.32.3
69+
KOPS_UTILS_CP_TAG=1.32.4
7070
KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
7171
# upup/models/cloudup/resources/addons/dns-controller/
72-
DNS_CONTROLLER_TAG=1.32.3
72+
DNS_CONTROLLER_TAG=1.32.4
7373
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
7474
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
75-
KOPS_CONTROLLER_TAG=1.32.3
75+
KOPS_CONTROLLER_TAG=1.32.4
7676
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
7777
# pkg/model/components/kubeapiserver/model.go
78-
KUBE_APISERVER_HEALTHCHECK_TAG=1.32.3
78+
KUBE_APISERVER_HEALTHCHECK_TAG=1.32.4
7979
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
8080

8181
CGO_ENABLED=0

‎cloudbuild.yaml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,64 @@
22
timeout: 1800s
33
options:
44
substitution_option: ALLOW_LOOSE
5-
machineType: 'N1_HIGHCPU_32'
5+
machineType: "E2_HIGHCPU_32"
66
steps:
7-
# Push the images
7+
# Push the images
88
- name: "mirror.gcr.io/library/golang:1.25.8-trixie"
9-
id: images
10-
entrypoint: make
11-
env:
12-
# _GIT_TAG is not a valid semver, we use CI=1 instead
13-
# - VERSION=$_GIT_TAG
14-
- CI=$_CI
15-
- PULL_BASE_REF=$_PULL_BASE_REF
16-
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
17-
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
18-
args:
19-
- kops-utils-cp-push
20-
- kops-controller-push
21-
- dns-controller-push
22-
- kube-apiserver-healthcheck-push
23-
# Push the artifacts
9+
id: images
10+
entrypoint: make
11+
env:
12+
# _GIT_TAG is not a valid semver, we use CI=1 instead
13+
# - VERSION=$_GIT_TAG
14+
- CI=$_CI
15+
- PULL_BASE_REF=$_PULL_BASE_REF
16+
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
17+
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
18+
args:
19+
- kops-utils-cp-push
20+
- kops-controller-push
21+
- dns-controller-push
22+
- kube-apiserver-healthcheck-push
23+
# Push the artifacts
2424
- name: "mirror.gcr.io/library/golang:1.25.8-trixie"
25-
id: artifacts
26-
entrypoint: make
27-
env:
28-
# _GIT_TAG is not a valid semver, we use CI=1 instead
29-
# - VERSION=$_GIT_TAG
30-
- CI=$_CI
31-
- PULL_BASE_REF=$_PULL_BASE_REF
32-
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
33-
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
34-
- GCS_LOCATION=$_GCS_LOCATION
35-
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
36-
args:
37-
- gcs-upload-and-tag
38-
# Build cloudbuild artifacts (for attestation)
25+
id: artifacts
26+
entrypoint: make
27+
env:
28+
# _GIT_TAG is not a valid semver, we use CI=1 instead
29+
# - VERSION=$_GIT_TAG
30+
- CI=$_CI
31+
- PULL_BASE_REF=$_PULL_BASE_REF
32+
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
33+
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
34+
- GCS_LOCATION=$_GCS_LOCATION
35+
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
36+
args:
37+
- gcs-upload-and-tag
38+
# Build cloudbuild artifacts (for attestation)
3939
- name: "mirror.gcr.io/library/golang:1.25.8-trixie"
40-
id: cloudbuild-artifacts
41-
entrypoint: make
42-
env:
43-
# _GIT_TAG is not a valid semver, we use CI=1 instead
44-
# - VERSION=$_GIT_TAG
45-
- CI=$_CI
46-
- PULL_BASE_REF=$_PULL_BASE_REF
47-
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
48-
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
49-
- GCS_LOCATION=$_GCS_LOCATION
50-
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
51-
args:
52-
- cloudbuild-artifacts
40+
id: cloudbuild-artifacts
41+
entrypoint: make
42+
env:
43+
# _GIT_TAG is not a valid semver, we use CI=1 instead
44+
# - VERSION=$_GIT_TAG
45+
- CI=$_CI
46+
- PULL_BASE_REF=$_PULL_BASE_REF
47+
- DOCKER_REGISTRY=$_DOCKER_REGISTRY
48+
- DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
49+
- GCS_LOCATION=$_GCS_LOCATION
50+
- LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
51+
args:
52+
- cloudbuild-artifacts
5353
substitutions:
5454
# _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
5555
# can be used as a substitution
56-
_CI: '1'
57-
_GIT_TAG: '12345'
58-
_PULL_BASE_REF: 'dev'
59-
_DOCKER_REGISTRY: 'gcr.io'
60-
_DOCKER_IMAGE_PREFIX: 'k8s-staging-kops/'
61-
_GCS_LOCATION: 'gs://k8s-staging-kops/kops/releases/'
56+
_CI: "1"
57+
_GIT_TAG: "12345"
58+
_PULL_BASE_REF: "dev"
59+
_DOCKER_REGISTRY: "gcr.io"
60+
_DOCKER_IMAGE_PREFIX: "k8s-staging-kops/"
61+
_GCS_LOCATION: "gs://k8s-staging-kops/kops/releases/"
6262
artifacts:
6363
objects:
64-
location: '$_GCS_LOCATION/$_GIT_TAG/cloudbuild/'
64+
location: "$_GCS_LOCATION/$_GIT_TAG/cloudbuild/"
6565
paths: ["cloudbuild/*"]

‎kops-version.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
2121

2222
// These constants are parsed by build tooling - be careful about changing the formats
2323
const (
24-
KOPS_RELEASE_VERSION = "1.32.3"
25-
KOPS_CI_VERSION = "1.32.4"
24+
KOPS_RELEASE_VERSION = "1.32.4"
25+
KOPS_CI_VERSION = "1.32.5"
2626
)
2727

2828
// GitVersion should be replaced by the makefile

‎pkg/model/components/etcdmanager/model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ spec:
208208
emptyDir: {}
209209
`
210210

211-
const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.32.3"
211+
const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.32.4"
212212

213213
// buildPod creates the pod spec, based on the EtcdClusterSpec
214214
func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {

‎pkg/model/components/etcdmanager/tests/interval/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Contents: |
113113
- --src=/ko-app/kops-utils-cp
114114
command:
115115
- /ko-app/kops-utils-cp
116-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
116+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
117117
name: kops-utils-cp
118118
resources: {}
119119
volumeMounts:
@@ -150,7 +150,7 @@ Contents: |
150150
- --src=/opt/etcd-v3.4.13/etcdctl
151151
command:
152152
- /opt/kops-utils/kops-utils-cp
153-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
153+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
154154
name: init-etcd-symlinks-3-4-13
155155
resources: {}
156156
volumeMounts:
@@ -171,7 +171,7 @@ Contents: |
171171
- --src=/opt/etcd-v3.5.21/etcdctl
172172
command:
173173
- /opt/kops-utils/kops-utils-cp
174-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
174+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
175175
name: init-etcd-symlinks-3-5-21
176176
resources: {}
177177
volumeMounts:
@@ -256,7 +256,7 @@ Contents: |
256256
- --src=/ko-app/kops-utils-cp
257257
command:
258258
- /ko-app/kops-utils-cp
259-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
259+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
260260
name: kops-utils-cp
261261
resources: {}
262262
volumeMounts:
@@ -293,7 +293,7 @@ Contents: |
293293
- --src=/opt/etcd-v3.4.13/etcdctl
294294
command:
295295
- /opt/kops-utils/kops-utils-cp
296-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
296+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
297297
name: init-etcd-symlinks-3-4-13
298298
resources: {}
299299
volumeMounts:
@@ -314,7 +314,7 @@ Contents: |
314314
- --src=/opt/etcd-v3.5.21/etcdctl
315315
command:
316316
- /opt/kops-utils/kops-utils-cp
317-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
317+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
318318
name: init-etcd-symlinks-3-5-21
319319
resources: {}
320320
volumeMounts:

‎pkg/model/components/etcdmanager/tests/minimal/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Contents: |
112112
- --src=/ko-app/kops-utils-cp
113113
command:
114114
- /ko-app/kops-utils-cp
115-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
115+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
116116
name: kops-utils-cp
117117
resources: {}
118118
volumeMounts:
@@ -149,7 +149,7 @@ Contents: |
149149
- --src=/opt/etcd-v3.4.13/etcdctl
150150
command:
151151
- /opt/kops-utils/kops-utils-cp
152-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
152+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
153153
name: init-etcd-symlinks-3-4-13
154154
resources: {}
155155
volumeMounts:
@@ -170,7 +170,7 @@ Contents: |
170170
- --src=/opt/etcd-v3.5.21/etcdctl
171171
command:
172172
- /opt/kops-utils/kops-utils-cp
173-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
173+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
174174
name: init-etcd-symlinks-3-5-21
175175
resources: {}
176176
volumeMounts:
@@ -254,7 +254,7 @@ Contents: |
254254
- --src=/ko-app/kops-utils-cp
255255
command:
256256
- /ko-app/kops-utils-cp
257-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
257+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
258258
name: kops-utils-cp
259259
resources: {}
260260
volumeMounts:
@@ -291,7 +291,7 @@ Contents: |
291291
- --src=/opt/etcd-v3.4.13/etcdctl
292292
command:
293293
- /opt/kops-utils/kops-utils-cp
294-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
294+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
295295
name: init-etcd-symlinks-3-4-13
296296
resources: {}
297297
volumeMounts:
@@ -312,7 +312,7 @@ Contents: |
312312
- --src=/opt/etcd-v3.5.21/etcdctl
313313
command:
314314
- /opt/kops-utils/kops-utils-cp
315-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
315+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
316316
name: init-etcd-symlinks-3-5-21
317317
resources: {}
318318
volumeMounts:

‎pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Contents: |
115115
- --src=/ko-app/kops-utils-cp
116116
command:
117117
- /ko-app/kops-utils-cp
118-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
118+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
119119
name: kops-utils-cp
120120
resources: {}
121121
volumeMounts:
@@ -152,7 +152,7 @@ Contents: |
152152
- --src=/opt/etcd-v3.4.13/etcdctl
153153
command:
154154
- /opt/kops-utils/kops-utils-cp
155-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
155+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
156156
name: init-etcd-symlinks-3-4-13
157157
resources: {}
158158
volumeMounts:
@@ -173,7 +173,7 @@ Contents: |
173173
- --src=/opt/etcd-v3.5.21/etcdctl
174174
command:
175175
- /opt/kops-utils/kops-utils-cp
176-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
176+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
177177
name: init-etcd-symlinks-3-5-21
178178
resources: {}
179179
volumeMounts:
@@ -260,7 +260,7 @@ Contents: |
260260
- --src=/ko-app/kops-utils-cp
261261
command:
262262
- /ko-app/kops-utils-cp
263-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
263+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
264264
name: kops-utils-cp
265265
resources: {}
266266
volumeMounts:
@@ -297,7 +297,7 @@ Contents: |
297297
- --src=/opt/etcd-v3.4.13/etcdctl
298298
command:
299299
- /opt/kops-utils/kops-utils-cp
300-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
300+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
301301
name: init-etcd-symlinks-3-4-13
302302
resources: {}
303303
volumeMounts:
@@ -318,7 +318,7 @@ Contents: |
318318
- --src=/opt/etcd-v3.5.21/etcdctl
319319
command:
320320
- /opt/kops-utils/kops-utils-cp
321-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
321+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
322322
name: init-etcd-symlinks-3-5-21
323323
resources: {}
324324
volumeMounts:

‎pkg/model/components/etcdmanager/tests/proxy/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Contents: |
121121
- --src=/ko-app/kops-utils-cp
122122
command:
123123
- /ko-app/kops-utils-cp
124-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
124+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
125125
name: kops-utils-cp
126126
resources: {}
127127
volumeMounts:
@@ -158,7 +158,7 @@ Contents: |
158158
- --src=/opt/etcd-v3.4.13/etcdctl
159159
command:
160160
- /opt/kops-utils/kops-utils-cp
161-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
161+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
162162
name: init-etcd-symlinks-3-4-13
163163
resources: {}
164164
volumeMounts:
@@ -179,7 +179,7 @@ Contents: |
179179
- --src=/opt/etcd-v3.5.21/etcdctl
180180
command:
181181
- /opt/kops-utils/kops-utils-cp
182-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
182+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
183183
name: init-etcd-symlinks-3-5-21
184184
resources: {}
185185
volumeMounts:
@@ -272,7 +272,7 @@ Contents: |
272272
- --src=/ko-app/kops-utils-cp
273273
command:
274274
- /ko-app/kops-utils-cp
275-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
275+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
276276
name: kops-utils-cp
277277
resources: {}
278278
volumeMounts:
@@ -309,7 +309,7 @@ Contents: |
309309
- --src=/opt/etcd-v3.4.13/etcdctl
310310
command:
311311
- /opt/kops-utils/kops-utils-cp
312-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
312+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
313313
name: init-etcd-symlinks-3-4-13
314314
resources: {}
315315
volumeMounts:
@@ -330,7 +330,7 @@ Contents: |
330330
- --src=/opt/etcd-v3.5.21/etcdctl
331331
command:
332332
- /opt/kops-utils/kops-utils-cp
333-
image: registry.k8s.io/kops/kops-utils-cp:1.32.3
333+
image: registry.k8s.io/kops/kops-utils-cp:1.32.4
334334
name: init-etcd-symlinks-3-5-21
335335
resources: {}
336336
volumeMounts:

‎pkg/model/components/kubeapiserver/model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ kind: Pod
8080
spec:
8181
containers:
8282
- name: healthcheck
83-
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.3
83+
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.4
8484
livenessProbe:
8585
httpGet:
8686
# The sidecar serves a healthcheck on the same port,

‎pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Contents: |
1010
- --ca-cert=/secrets/ca.crt
1111
- --client-cert=/secrets/client.crt
1212
- --client-key=/secrets/client.key
13-
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.3
13+
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.32.4
1414
livenessProbe:
1515
httpGet:
1616
host: 127.0.0.1

0 commit comments

Comments
 (0)