Sitelet https://github.com/kubernetes/kops/commit/6849007aacdd7f163175f45e53dadf4c0a83d591
Skip to content

Commit 6849007

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #18325 from hakman/automated-cherry-pick-of-#18323-upstream-release-1.34
Automated cherry pick of #18323: etcd-manager: upgrade to v3.0.20260512
2 parents 72a0c61 + 3908b38 commit 6849007

181 files changed

Lines changed: 186 additions & 186 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ metadata:
171171
spec:
172172
containers:
173173
- name: etcd-manager
174-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
174+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
175175
resources:
176176
requests:
177177
cpu: 100m

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Contents: |
8585
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
8686
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
8787
> /tmp/pipe 2>&1
88-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
88+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
8989
name: etcd-manager
9090
resources:
9191
requests:
@@ -255,7 +255,7 @@ Contents: |
255255
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
256256
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
257257
> /tmp/pipe 2>&1
258-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
258+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
259259
name: etcd-manager
260260
resources:
261261
requests:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Contents: |
8484
--quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
8585
--volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
8686
--volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
87-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
87+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
8888
name: etcd-manager
8989
resources:
9090
requests:
@@ -201,7 +201,7 @@ Contents: |
201201
--quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
202202
--volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
203203
--volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
204-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
204+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
205205
name: etcd-manager
206206
resources:
207207
requests:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Contents: |
8787
env:
8888
- name: ETCD_QUOTA_BACKEND_BYTES
8989
value: "10737418240"
90-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
90+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
9191
name: etcd-manager
9292
resources:
9393
requests:
@@ -259,7 +259,7 @@ Contents: |
259259
env:
260260
- name: ETCD_QUOTA_BACKEND_BYTES
261261
value: "10737418240"
262-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
262+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
263263
name: etcd-manager
264264
resources:
265265
requests:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Contents: |
9393
value: http://proxy.example.com
9494
- name: no_proxy
9595
value: noproxy.example.com
96-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
96+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
9797
name: etcd-manager
9898
resources:
9999
requests:
@@ -271,7 +271,7 @@ Contents: |
271271
value: http://proxy.example.com
272272
- name: no_proxy
273273
value: noproxy.example.com
274-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
274+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
275275
name: etcd-manager
276276
resources:
277277
requests:

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
env:
2222
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
2323
value: 90d
24-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
24+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
2525
name: etcd-manager
2626
resources:
2727
requests:

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
env:
2222
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
2323
value: 90d
24-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
24+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
2525
name: etcd-manager
2626
resources:
2727
requests:

‎tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
env:
2424
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
2525
value: 90d
26-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
26+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
2727
name: etcd-manager
2828
resources:
2929
requests:

‎tests/integration/update_cluster/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
env:
2424
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
2525
value: 90d
26-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
26+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
2727
name: etcd-manager
2828
resources:
2929
requests:

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
env:
2121
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
2222
value: 90d
23-
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260227
23+
image: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
2424
name: etcd-manager
2525
resources:
2626
requests:

0 commit comments

Comments
 (0)