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

Commit b0f3768

Browse files
kubernetes-prow[bot]kubernetes-prow[bot]
authored
Merge pull request #18557 from Jefftree/etcd-3.7-default
Default to etcd 3.7.0 for Kubernetes 1.37+
2 parents 31c024c + 6b1aa00 commit b0f3768

197 files changed

Lines changed: 634 additions & 632 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/etcd.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ var _ loader.ClusterOptionsBuilder = &EtcdOptionsBuilder{}
3131
const (
3232
LatestEtcd35Version = "3.5.31"
3333
LatestEtcd36Version = "3.6.12"
34-
// TODO: replace with the released etcd 3.7 version before the Kubernetes 1.37 release.
35-
LatestEtcd37Version = "3.7.0-rc.0"
34+
LatestEtcd37Version = "3.7.0"
3635
)
3736

3837
// BuildOptions is responsible for filling in the defaults for the etcd cluster model
@@ -44,10 +43,13 @@ func (b *EtcdOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4443
// Ensure the version is set
4544
if c.Version == "" {
4645
// We run the k8s-recommended versions of etcd
47-
if b.ControlPlaneKubernetesVersion().IsLT("1.34.0") {
46+
switch {
47+
case b.ControlPlaneKubernetesVersion().IsLT("1.34.0"):
4848
c.Version = LatestEtcd35Version
49-
} else {
49+
case b.ControlPlaneKubernetesVersion().IsLT("1.37.0"):
5050
c.Version = LatestEtcd36Version
51+
default:
52+
c.Version = LatestEtcd37Version
5153
}
5254
}
5355
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ Contents: |
156156
- mountPath: /opt
157157
name: opt
158158
- args:
159-
- --target-dir=/opt/etcd-v3.7.0-rc.0
159+
- --target-dir=/opt/etcd-v3.7.0
160160
- --src=/usr/local/bin/etcd
161161
- --src=/usr/local/bin/etcdctl
162162
command:
163163
- /opt/kops-utils/kops-utils-cp
164-
image: registry.k8s.io/etcd:v3.7.0-rc.0
165-
name: init-etcd-3-7-0-rc-0
164+
image: registry.k8s.io/etcd:v3.7.0
165+
name: init-etcd-3-7-0
166166
resources: {}
167167
volumeMounts:
168168
- mountPath: /opt
@@ -357,13 +357,13 @@ Contents: |
357357
- mountPath: /opt
358358
name: opt
359359
- args:
360-
- --target-dir=/opt/etcd-v3.7.0-rc.0
360+
- --target-dir=/opt/etcd-v3.7.0
361361
- --src=/usr/local/bin/etcd
362362
- --src=/usr/local/bin/etcdctl
363363
command:
364364
- /opt/kops-utils/kops-utils-cp
365-
image: registry.k8s.io/etcd:v3.7.0-rc.0
366-
name: init-etcd-3-7-0-rc-0
365+
image: registry.k8s.io/etcd:v3.7.0
366+
name: init-etcd-3-7-0
367367
resources: {}
368368
volumeMounts:
369369
- mountPath: /opt

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ Contents: |
204204
name: etcd-v3-6-12
205205
- mountPath: /opt/etcd-v3.6.12
206206
name: etcd-v3-6-12
207-
- mountPath: /opt/etcd-v3.7.0-rc.0
208-
name: etcd-v3-7-0-rc-0
207+
- mountPath: /opt/etcd-v3.7.0
208+
name: etcd-v3-7-0
209209
- mountPath: /var/log/etcd.log
210210
name: varlogetcd
211211
hostNetwork: true
@@ -239,8 +239,8 @@ Contents: |
239239
name: etcd-v3-6-12
240240
- image:
241241
pullPolicy: IfNotPresent
242-
reference: registry.k8s.io/etcd:v3.7.0-rc.0
243-
name: etcd-v3-7-0-rc-0
242+
reference: registry.k8s.io/etcd:v3.7.0
243+
name: etcd-v3-7-0
244244
- hostPath:
245245
path: /var/log/etcd-events.log
246246
type: FileOrCreate
@@ -392,8 +392,8 @@ Contents: |
392392
name: etcd-v3-6-12
393393
- mountPath: /opt/etcd-v3.6.12
394394
name: etcd-v3-6-12
395-
- mountPath: /opt/etcd-v3.7.0-rc.0
396-
name: etcd-v3-7-0-rc-0
395+
- mountPath: /opt/etcd-v3.7.0
396+
name: etcd-v3-7-0
397397
- mountPath: /var/log/etcd.log
398398
name: varlogetcd
399399
hostNetwork: true
@@ -427,8 +427,8 @@ Contents: |
427427
name: etcd-v3-6-12
428428
- image:
429429
pullPolicy: IfNotPresent
430-
reference: registry.k8s.io/etcd:v3.7.0-rc.0
431-
name: etcd-v3-7-0-rc-0
430+
reference: registry.k8s.io/etcd:v3.7.0
431+
name: etcd-v3-7-0
432432
- hostPath:
433433
path: /var/log/etcd.log
434434
type: FileOrCreate

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ Contents: |
157157
- mountPath: /opt
158158
name: opt
159159
- args:
160-
- --target-dir=/opt/etcd-v3.7.0-rc.0
160+
- --target-dir=/opt/etcd-v3.7.0
161161
- --src=/usr/local/bin/etcd
162162
- --src=/usr/local/bin/etcdctl
163163
command:
164164
- /opt/kops-utils/kops-utils-cp
165-
image: registry.k8s.io/etcd:v3.7.0-rc.0
166-
name: init-etcd-3-7-0-rc-0
165+
image: registry.k8s.io/etcd:v3.7.0
166+
name: init-etcd-3-7-0
167167
resources: {}
168168
volumeMounts:
169169
- mountPath: /opt
@@ -358,13 +358,13 @@ Contents: |
358358
- mountPath: /opt
359359
name: opt
360360
- args:
361-
- --target-dir=/opt/etcd-v3.7.0-rc.0
361+
- --target-dir=/opt/etcd-v3.7.0
362362
- --src=/usr/local/bin/etcd
363363
- --src=/usr/local/bin/etcdctl
364364
command:
365365
- /opt/kops-utils/kops-utils-cp
366-
image: registry.k8s.io/etcd:v3.7.0-rc.0
367-
name: init-etcd-3-7-0-rc-0
366+
image: registry.k8s.io/etcd:v3.7.0
367+
name: init-etcd-3-7-0
368368
resources: {}
369369
volumeMounts:
370370
- mountPath: /opt

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ Contents: |
163163
- mountPath: /opt
164164
name: opt
165165
- args:
166-
- --target-dir=/opt/etcd-v3.7.0-rc.0
166+
- --target-dir=/opt/etcd-v3.7.0
167167
- --src=/usr/local/bin/etcd
168168
- --src=/usr/local/bin/etcdctl
169169
command:
170170
- /opt/kops-utils/kops-utils-cp
171-
image: registry.k8s.io/etcd:v3.7.0-rc.0
172-
name: init-etcd-3-7-0-rc-0
171+
image: registry.k8s.io/etcd:v3.7.0
172+
name: init-etcd-3-7-0
173173
resources: {}
174174
volumeMounts:
175175
- mountPath: /opt
@@ -370,13 +370,13 @@ Contents: |
370370
- mountPath: /opt
371371
name: opt
372372
- args:
373-
- --target-dir=/opt/etcd-v3.7.0-rc.0
373+
- --target-dir=/opt/etcd-v3.7.0
374374
- --src=/usr/local/bin/etcd
375375
- --src=/usr/local/bin/etcdctl
376376
command:
377377
- /opt/kops-utils/kops-utils-cp
378-
image: registry.k8s.io/etcd:v3.7.0-rc.0
379-
name: init-etcd-3-7-0-rc-0
378+
image: registry.k8s.io/etcd:v3.7.0
379+
name: init-etcd-3-7-0
380380
resources: {}
381381
volumeMounts:
382382
- mountPath: /opt

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ spec:
139139
name: etcd-v3-6-12
140140
- mountPath: /opt/etcd-v3.6.12
141141
name: etcd-v3-6-12
142-
- mountPath: /opt/etcd-v3.7.0-rc.0
143-
name: etcd-v3-7-0-rc-0
142+
- mountPath: /opt/etcd-v3.7.0
143+
name: etcd-v3-7-0
144144
- mountPath: /var/log/etcd.log
145145
name: varlogetcd
146146
hostNetwork: true
@@ -174,8 +174,8 @@ spec:
174174
name: etcd-v3-6-12
175175
- image:
176176
pullPolicy: IfNotPresent
177-
reference: registry.k8s.io/etcd:v3.7.0-rc.0
178-
name: etcd-v3-7-0-rc-0
177+
reference: registry.k8s.io/etcd:v3.7.0
178+
name: etcd-v3-7-0
179179
- hostPath:
180180
path: /var/log/etcd-events.log
181181
type: FileOrCreate

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ spec:
139139
name: etcd-v3-6-12
140140
- mountPath: /opt/etcd-v3.6.12
141141
name: etcd-v3-6-12
142-
- mountPath: /opt/etcd-v3.7.0-rc.0
143-
name: etcd-v3-7-0-rc-0
142+
- mountPath: /opt/etcd-v3.7.0
143+
name: etcd-v3-7-0
144144
- mountPath: /var/log/etcd.log
145145
name: varlogetcd
146146
hostNetwork: true
@@ -174,8 +174,8 @@ spec:
174174
name: etcd-v3-6-12
175175
- image:
176176
pullPolicy: IfNotPresent
177-
reference: registry.k8s.io/etcd:v3.7.0-rc.0
178-
name: etcd-v3-7-0-rc-0
177+
reference: registry.k8s.io/etcd:v3.7.0
178+
name: etcd-v3-7-0
179179
- hostPath:
180180
path: /var/log/etcd.log
181181
type: FileOrCreate

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ spec:
141141
name: etcd-v3-6-12
142142
- mountPath: /opt/etcd-v3.6.12
143143
name: etcd-v3-6-12
144-
- mountPath: /opt/etcd-v3.7.0-rc.0
145-
name: etcd-v3-7-0-rc-0
144+
- mountPath: /opt/etcd-v3.7.0
145+
name: etcd-v3-7-0
146146
- mountPath: /var/log/etcd.log
147147
name: varlogetcd
148148
hostNetwork: true
@@ -176,8 +176,8 @@ spec:
176176
name: etcd-v3-6-12
177177
- image:
178178
pullPolicy: IfNotPresent
179-
reference: registry.k8s.io/etcd:v3.7.0-rc.0
180-
name: etcd-v3-7-0-rc-0
179+
reference: registry.k8s.io/etcd:v3.7.0
180+
name: etcd-v3-7-0
181181
- hostPath:
182182
path: /var/log/etcd-events.log
183183
type: FileOrCreate

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ spec:
141141
name: etcd-v3-6-12
142142
- mountPath: /opt/etcd-v3.6.12
143143
name: etcd-v3-6-12
144-
- mountPath: /opt/etcd-v3.7.0-rc.0
145-
name: etcd-v3-7-0-rc-0
144+
- mountPath: /opt/etcd-v3.7.0
145+
name: etcd-v3-7-0
146146
- mountPath: /var/log/etcd.log
147147
name: varlogetcd
148148
hostNetwork: true
@@ -176,8 +176,8 @@ spec:
176176
name: etcd-v3-6-12
177177
- image:
178178
pullPolicy: IfNotPresent
179-
reference: registry.k8s.io/etcd:v3.7.0-rc.0
180-
name: etcd-v3-7-0-rc-0
179+
reference: registry.k8s.io/etcd:v3.7.0
180+
name: etcd-v3-7-0
181181
- hostPath:
182182
path: /var/log/etcd.log
183183
type: FileOrCreate

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ spec:
9090
- mountPath: /opt
9191
name: opt
9292
- args:
93-
- --target-dir=/opt/etcd-v3.7.0-rc.0
93+
- --target-dir=/opt/etcd-v3.7.0
9494
- --src=/usr/local/bin/etcd
9595
- --src=/usr/local/bin/etcdctl
9696
command:
9797
- /opt/kops-utils/kops-utils-cp
98-
image: registry.k8s.io/etcd:v3.7.0-rc.0
99-
name: init-etcd-3-7-0-rc-0
98+
image: registry.k8s.io/etcd:v3.7.0
99+
name: init-etcd-3-7-0
100100
resources: {}
101101
volumeMounts:
102102
- mountPath: /opt

0 commit comments

Comments
 (0)