Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update etcd to v3.5.7 #15088

Merged
merged 2 commits into from Feb 1, 2023
Merged

Update etcd to v3.5.7 #15088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e75a5bf
Update etcd to v3.5.7
hakman Feb 1, 2023
dc9c26b
hack/update-expected.sh
hakman Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion pkg/model/components/etcd.go
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}

const (
DefaultEtcd3Version_1_20 = "3.4.13"
DefaultEtcd3Version_1_22 = "3.5.6"
DefaultEtcd3Version_1_22 = "3.5.7"
)

// BuildOptions is responsible for filling in the defaults for the etcd cluster model
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/etcdmanager/model.go
View file
Open in desktop
Expand Up @@ -181,7 +181,7 @@ metadata:
spec:
containers:
- name: etcd-manager
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
resources:
requests:
cpu: 100m
Expand Down
17 changes: 16 additions & 1 deletion pkg/model/components/etcdmanager/options.go
View file
Open in desktop
Expand Up @@ -62,7 +62,22 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error {
return nil
}

var supportedEtcdVersions = []string{"3.1.12", "3.2.18", "3.2.24", "3.3.10", "3.3.13", "3.3.17", "3.4.3", "3.4.13", "3.5.0", "3.5.1", "3.5.3", "3.5.4", "3.5.6"}
var supportedEtcdVersions = []string{
"3.1.12",
"3.2.18",
"3.2.24",
"3.3.10",
"3.3.13",
"3.3.17",
"3.4.3",
"3.4.13",
"3.5.0",
"3.5.1",
"3.5.3",
"3.5.4",
"3.5.6",
"3.5.7",
}

func etcdVersionIsSupported(version string) bool {
version = strings.TrimPrefix(version, "v")
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/interval/tasks.yaml
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ Contents: |
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
> /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down Expand Up @@ -155,7 +155,7 @@ Contents: |
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
> /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ Contents: |
--quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
--volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down Expand Up @@ -153,7 +153,7 @@ Contents: |
--quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
--volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@ Contents: |
env:
- name: ETCD_QUOTA_BACKEND_BYTES
value: "10737418240"
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down Expand Up @@ -159,7 +159,7 @@ Contents: |
env:
- name: ETCD_QUOTA_BACKEND_BYTES
value: "10737418240"
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ Contents: |
value: http://proxy.example.com
- name: no_proxy
value: noproxy.example.com
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down Expand Up @@ -171,7 +171,7 @@ Contents: |
value: http://proxy.example.com
- name: no_proxy
value: noproxy.example.com
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions ...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
View file
Open in desktop
Expand Up @@ -138,11 +138,11 @@ etcdClusters:
events:
cpuRequest: 100m
memoryRequest: 100Mi
version: 3.5.6
version: 3.5.7
main:
cpuRequest: 200m
memoryRequest: 100Mi
version: 3.5.6
version: 3.5.7
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
4 changes: 2 additions & 2 deletions ...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ spec:
name: a
memoryRequest: 100Mi
name: main
version: 3.5.6
version: 3.5.7
- backups:
backupStore: memfs://tests/additionalobjects.example.com/backups/etcd/events
cpuRequest: 100m
Expand All @@ -47,7 +47,7 @@ spec:
name: a
memoryRequest: 100Mi
name: events
version: 3.5.6
version: 3.5.7
externalDns:
provider: dns-controller
iam:
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...ration/update_cluster/additionalobjects/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions ...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Open in desktop
Expand Up @@ -134,9 +134,9 @@ docker:
encryptionConfig: null
etcdClusters:
events:
version: 3.5.6
version: 3.5.7
main:
version: 3.5.6
version: 3.5.7
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
4 changes: 2 additions & 2 deletions ...tegration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Expand Up @@ -32,14 +32,14 @@ spec:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
version: 3.5.6
version: 3.5.7
- backups:
backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd/events
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: events
version: 3.5.6
version: 3.5.7
externalDns:
provider: dns-controller
iam:
Expand Down
2 changes: 1 addition & 1 deletion ...gration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...tegration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion .../apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ spec:
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
> /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...er/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ spec:
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
> /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...s-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ spec:
--quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
--volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ spec:
--quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
--volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...ional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...itional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions ...nch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data
View file
Open in desktop
Expand Up @@ -136,9 +136,9 @@ docker:
encryptionConfig: null
etcdClusters:
events:
version: 3.5.6
version: 3.5.7
main:
version: 3.5.6
version: 3.5.7
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
4 changes: 2 additions & 2 deletions ...ter-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Expand Up @@ -65,14 +65,14 @@ spec:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
version: 3.5.6
version: 3.5.7
- backups:
backupStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/backups/etcd/events
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: events
version: 3.5.6
version: 3.5.7
externalDns:
provider: dns-controller
keyStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/pki
Expand Down
2 changes: 1 addition & 1 deletion ...r-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...ter-autoscaler-priority-expander-custom/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...expander-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander-custom.example.com=owned
> /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...y-expander-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/cas-priority-expander-custom.example.com=owned
> /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions ...aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data
View file
Open in desktop
Expand Up @@ -136,9 +136,9 @@ docker:
encryptionConfig: null
etcdClusters:
events:
version: 3.5.6
version: 3.5.7
main:
version: 3.5.6
version: 3.5.7
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
4 changes: 2 additions & 2 deletions ...er/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Expand Up @@ -58,14 +58,14 @@ spec:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
version: 3.5.6
version: 3.5.7
- backups:
backupStore: memfs://clusters.example.com/cas-priority-expander.example.com/backups/etcd/events
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: events
version: 3.5.6
version: 3.5.7
externalDns:
provider: dns-controller
keyStore: memfs://clusters.example.com/cas-priority-expander.example.com/pki
Expand Down
2 changes: 1 addition & 1 deletion .../cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-events_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...er/cluster-autoscaler-priority-expander/data/aws_s3_object_etcd-cluster-spec-main_content
View file
Open in desktop
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.6"
"etcdVersion": "3.5.7"
}
2 changes: 1 addition & 1 deletion ...iority-expander/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/cas-priority-expander.example.com=owned >
/tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion ...priority-expander/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ spec:
--volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
--volume-tag=kubernetes.io/cluster/cas-priority-expander.example.com=owned >
/tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20230201
name: etcd-manager
resources:
requests:
Expand Down