Merge pull request #13501 from justinsb/etcd_3_5_3

etcd 3 5 3
2022-04-17 14:52:40 -07:00 · 2022-04-17 14:52:40 -07:00 · a2e33ac3ad
parent 02e1abc068 6d7bd22853
commit a2e33ac3ad
31 changed files with 46 additions and 46 deletions
--- a/pkg/model/components/etcd.go
+++ b/pkg/model/components/etcd.go
@ -30,7 +30,7 @@ var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}

 const (
 	DefaultEtcd3Version_1_19 = "3.4.13"
-	DefaultEtcd3Version_1_22 = "3.5.1"
+	DefaultEtcd3Version_1_22 = "3.5.3"
 )

 // BuildOptions is responsible for filling in the defaults for the etcd cluster model
--- a/pkg/model/components/etcdmanager/options.go
+++ b/pkg/model/components/etcdmanager/options.go
@ -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"}
+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"}

 func etcdVersionIsSupported(version string) bool {
 	version = strings.TrimPrefix(version, "v")
--- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
+++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
@ -314,9 +314,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
  encryptionConfig: null
  etcdClusters:
    events:
-      version: 3.5.1
+      version: 3.5.3
    main:
-      version: 3.5.1
+      version: 3.5.3
  kubeAPIServer:
    allowPrivileged: true
    anonymousAuth: false
--- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -137,9 +137,9 @@ docker:
 encryptionConfig: null
 etcdClusters:
  events:
-    version: 3.5.1
+    version: 3.5.3
  main:
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
@ -32,14 +32,14 @@ spec:
    - instanceGroup: master-us-test-1a
      name: us-test-1a
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - 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.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -137,9 +137,9 @@ docker:
 encryptionConfig: null
 etcdClusters:
  events:
-    version: 3.5.1
+    version: 3.5.3
  main:
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_cluster-completed.spec_content
@ -57,14 +57,14 @@ spec:
    - instanceGroup: master-us-test-1a
      name: us-test-1a
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - 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.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -139,11 +139,11 @@ etcdClusters:
  events:
    cpuRequest: 100m
    memoryRequest: 100Mi
-    version: 3.5.1
+    version: 3.5.3
  main:
    cpuRequest: 200m
    memoryRequest: 100Mi
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_cluster-completed.spec_content
@ -35,7 +35,7 @@ spec:
      name: a
    memoryRequest: 100Mi
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - backups:
      backupStore: memfs://tests/minimal.example.com/backups/etcd/events
    cpuRequest: 100m
@ -45,7 +45,7 @@ spec:
      name: a
    memoryRequest: 100Mi
    name: events
-    version: 3.5.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@ -139,11 +139,11 @@ etcdClusters:
  events:
    cpuRequest: 100m
    memoryRequest: 100Mi
-    version: 3.5.1
+    version: 3.5.3
  main:
    cpuRequest: 200m
    memoryRequest: 100Mi
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_cluster-completed.spec_content
@ -44,7 +44,7 @@ spec:
      name: a
    memoryRequest: 100Mi
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - backups:
      backupStore: memfs://tests/minimal.example.com/backups/etcd/events
    cpuRequest: 100m
@ -54,7 +54,7 @@ spec:
      name: a
    memoryRequest: 100Mi
    name: events
-    version: 3.5.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
@ -140,9 +140,9 @@ docker:
 encryptionConfig: null
 etcdClusters:
  events:
-    version: 3.5.1
+    version: 3.5.3
  main:
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_cluster-completed.spec_content
@ -45,14 +45,14 @@ spec:
    - instanceGroup: master-us-test-1a
      name: us-test-1a
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - backups:
      backupStore: memfs://clusters.example.com/minimal-ipv6.example.com/backups/etcd/events
    etcdMembers:
    - instanceGroup: master-us-test-1a
      name: us-test-1a
    name: events
-    version: 3.5.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
@ -33,14 +33,14 @@ spec:
    - instanceGroup: master-us-test1-a
      name: "1"
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - backups:
      backupStore: memfs://tests/minimal-gce.example.com/backups/etcd/events
    etcdMembers:
    - instanceGroup: master-us-test1-a
      name: "1"
    name: events
-    version: 3.5.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
+++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
@ -137,9 +137,9 @@ docker:
 encryptionConfig: null
 etcdClusters:
  events:
-    version: 3.5.1
+    version: 3.5.3
  main:
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
+++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
@ -137,9 +137,9 @@ docker:
 encryptionConfig: null
 etcdClusters:
  events:
-    version: 3.5.1
+    version: 3.5.3
  main:
-    version: 3.5.1
+    version: 3.5.3
 kubeAPIServer:
  allowPrivileged: true
  anonymousAuth: false
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content
@ -34,14 +34,14 @@ spec:
    - instanceGroup: master-us-test-1a
      name: us-test-1a
    name: main
-    version: 3.5.1
+    version: 3.5.3
  - backups:
      backupStore: memfs://clusters.example.com/privatecanal.example.com/backups/etcd/events
    etcdMembers:
    - instanceGroup: master-us-test-1a
      name: us-test-1a
    name: events
-    version: 3.5.1
+    version: 3.5.3
  externalDns:
    provider: dns-controller
  iam:
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-events_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-events_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }
--- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-main_content
+++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_etcd-cluster-spec-main_content
@ -1,4 +1,4 @@
 {
  "memberCount": 1,
-  "etcdVersion": "3.5.1"
+  "etcdVersion": "3.5.3"
 }