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.

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

Update etcd to v3.5.6 #14734

Merged
merged 3 commits into from
Dec 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/model/components/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}

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

// BuildOptions is responsible for filling in the defaults for the etcd cluster model
Expand Down
3 changes: 2 additions & 1 deletion pkg/model/components/etcdmanager/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ metadata:
spec:
containers:
- name: etcd-manager
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
#image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
resources:
requests:
cpu: 100m
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/etcdmanager/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ 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"}
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"}

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
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Contents: |
env:
- name: ETCD_QUOTA_BACKEND_BYTES
value: "10737418240"
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ etcdClusters:
events:
cpuRequest: 100m
memoryRequest: 100Mi
version: 3.5.4
version: 3.5.6
main:
cpuRequest: 200m
memoryRequest: 100Mi
version: 3.5.4
version: 3.5.6
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
name: a
memoryRequest: 100Mi
name: main
version: 3.5.4
version: 3.5.6
- 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.4
version: 3.5.6
externalDns:
provider: dns-controller
iam:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.4"
"etcdVersion": "3.5.6"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.4"
"etcdVersion": "3.5.6"
}
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ docker:
encryptionConfig: null
etcdClusters:
events:
version: 3.5.4
version: 3.5.6
main:
version: 3.5.4
version: 3.5.6
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ spec:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
version: 3.5.4
version: 3.5.6
- 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.4
version: 3.5.6
externalDns:
provider: dns-controller
iam:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.4"
"etcdVersion": "3.5.6"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.4"
"etcdVersion": "3.5.6"
}
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ docker:
encryptionConfig: null
etcdClusters:
events:
version: 3.5.4
version: 3.5.6
main:
version: 3.5.4
version: 3.5.6
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ spec:
- instanceGroup: master-us-test-1a
name: a
name: main
version: 3.5.4
version: 3.5.6
- backups:
backupStore: memfs://clusters.example.com/complex.example.com/backups/etcd/events
etcdMembers:
- instanceGroup: master-us-test-1a
name: a
name: events
version: 3.5.4
version: 3.5.6
externalDns:
provider: dns-controller
iam:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.4"
"etcdVersion": "3.5.6"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"memberCount": 1,
"etcdVersion": "3.5.4"
"etcdVersion": "3.5.6"
}
Original file line number Diff line number Diff line change
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/complex.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/complex.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/compress.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/compress.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/containerd.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/containerd.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/containerd.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/containerd.example.com=owned > /tmp/pipe
2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/123.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/123.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
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/docker.example.com=owned > /tmp/pipe 2>&1
image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
name: etcd-manager
resources:
requests:
Expand Down
Loading