From bb52334222638c5eacf2e929dc0a06509589f3ab Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Tue, 27 Apr 2021 08:32:13 +0200 Subject: [PATCH 1/2] Make the events etcd cluster optional --- nodeup/pkg/model/etcd_manager_tls.go | 3 ++- nodeup/pkg/model/kube_apiserver.go | 26 ++++++++++++++------------ pkg/model/components/apiserver.go | 17 +++++++++++++++-- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/nodeup/pkg/model/etcd_manager_tls.go b/nodeup/pkg/model/etcd_manager_tls.go index 370d54e6ed5cb..fd2417d5dbcaa 100644 --- a/nodeup/pkg/model/etcd_manager_tls.go +++ b/nodeup/pkg/model/etcd_manager_tls.go @@ -41,7 +41,8 @@ func (b *EtcdManagerTLSBuilder) Build(ctx *fi.ModelBuilderContext) error { return err } - for _, k := range []string{"main", "events"} { + for _, etcdCluster := range b.Cluster.Spec.EtcdClusters { + k := etcdCluster.Name d := "/etc/kubernetes/pki/etcd-manager-" + k keys := make(map[string]string) diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index d18326e41785b..f7ff9a43bcdca 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -312,14 +312,20 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) { } } - var mainEtcdCluster, eventsEtcdCluster string - if b.IsMaster { - mainEtcdCluster = "https://127.0.0.1:4001" - eventsEtcdCluster = "https://127.0.0.1:4002" - } else { - host := b.Cluster.ObjectMeta.Name - mainEtcdCluster = "https://main.etcd." + host + ":4001" - eventsEtcdCluster = "https://events.etcd." + host + ":4002" + // we need to replace 127.0.0.1 for etcd urls with the dns names in case this apiserver is not + // running on master nodes + if !b.IsMaster { + clusterName := b.Cluster.ObjectMeta.Name + mainEtcdDNSName := "main.etcd." + clusterName + eventsEtcdDNSName := "events.etcd." + clusterName + for i := range kubeAPIServer.EtcdServers { + kubeAPIServer.EtcdServers[i] = strings.ReplaceAll(kubeAPIServer.EtcdServers[i], "127.0.0.1", mainEtcdDNSName) + } + for i := range kubeAPIServer.EtcdServersOverrides { + if strings.HasPrefix(kubeAPIServer.EtcdServersOverrides[i], "/events") { + kubeAPIServer.EtcdServersOverrides[i] = strings.ReplaceAll(kubeAPIServer.EtcdServersOverrides[i], "127.0.0.1", eventsEtcdDNSName) + } + } } if b.UseEtcdManager() && b.UseEtcdTLS() { @@ -327,14 +333,10 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) { kubeAPIServer.EtcdCAFile = filepath.Join(basedir, "etcd-ca.crt") kubeAPIServer.EtcdCertFile = filepath.Join(basedir, "etcd-client.crt") kubeAPIServer.EtcdKeyFile = filepath.Join(basedir, "etcd-client.key") - kubeAPIServer.EtcdServers = []string{mainEtcdCluster} - kubeAPIServer.EtcdServersOverrides = []string{"/events#" + eventsEtcdCluster} } else if b.UseEtcdTLS() { kubeAPIServer.EtcdCAFile = filepath.Join(b.PathSrvKubernetes(), "ca.crt") kubeAPIServer.EtcdCertFile = filepath.Join(b.PathSrvKubernetes(), "etcd-client.pem") kubeAPIServer.EtcdKeyFile = filepath.Join(b.PathSrvKubernetes(), "etcd-client-key.pem") - kubeAPIServer.EtcdServers = []string{mainEtcdCluster} - kubeAPIServer.EtcdServersOverrides = []string{"/events#" + eventsEtcdCluster} } // @note we are making assumption were using the ones created by the pki model, not custom defined ones diff --git a/pkg/model/components/apiserver.go b/pkg/model/components/apiserver.go index ec69e27078cbb..f6c92dd76fa4d 100644 --- a/pkg/model/components/apiserver.go +++ b/pkg/model/components/apiserver.go @@ -133,8 +133,21 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error { c.AllowPrivileged = fi.Bool(true) c.ServiceClusterIPRange = clusterSpec.ServiceClusterIPRange - c.EtcdServers = []string{"http://127.0.0.1:4001"} - c.EtcdServersOverrides = []string{"/events#http://127.0.0.1:4002"} + c.EtcdServers = nil + c.EtcdServersOverrides = nil + + for _, etcdCluster := range clusterSpec.EtcdClusters { + protocol := "http" + if etcdCluster.EnableEtcdTLS { + protocol = "https" + } + switch etcdCluster.Name { + case "main": + c.EtcdServers = append(c.EtcdServers, protocol+"://127.0.0.1:4001") + case "events": + c.EtcdServersOverrides = append(c.EtcdServersOverrides, "/events#"+protocol+"://127.0.0.1:4002") + } + } // TODO: We can probably rewrite these more clearly in descending order // Based on recommendations from: From 5306e27646a705cf3e6d7749d406dfe5f851ee03 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Thu, 20 May 2021 08:11:35 +0200 Subject: [PATCH 2/2] Run ./hack/update-expected.sh --- .../cloudformation.json.extracted.yaml | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- ...-1a.masters.bastionuserdata.example.com_user_data | 4 ++-- .../complex/cloudformation.json.extracted.yaml | 2 +- ...-us-test-1a.masters.complex.example.com_user_data | 4 ++-- ...us-test-1a.masters.compress.example.com_user_data | 2 +- .../cloudformation.json.extracted.yaml | 4 ++-- .../containerd/cloudformation.json.extracted.yaml | 4 ++-- .../docker-custom/cloudformation.json.extracted.yaml | 4 ++-- ...est-1a.masters.existing-iam.example.com_user_data | 4 ++-- ...est-1b.masters.existing-iam.example.com_user_data | 4 ++-- ...est-1c.masters.existing-iam.example.com_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 4 ++-- ...-test-1a.masters.existingsg.example.com_user_data | 4 ++-- ...-test-1b.masters.existingsg.example.com_user_data | 4 ++-- ...-test-1c.masters.existingsg.example.com_user_data | 4 ++-- .../externallb/cloudformation.json.extracted.yaml | 4 ++-- ...-test-1a.masters.externallb.example.com_user_data | 4 ++-- ...1a.masters.externalpolicies.example.com_user_data | 4 ++-- ...aster-us-test-1a.masters.ha.example.com_user_data | 4 ++-- ...aster-us-test-1b.masters.ha.example.com_user_data | 4 ++-- ...aster-us-test-1c.masters.ha.example.com_user_data | 4 ++-- ...est1-a-ha-gce-example-com_metadata_startup-script | 4 ++-- ...est1-b-ha-gce-example-com_metadata_startup-script | 4 ++-- ...est1-c-ha-gce-example-com_metadata_startup-script | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../minimal-etcd/cloudformation.json.extracted.yaml | 4 ++-- .../minimal-gp3/cloudformation.json.extracted.yaml | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- .../minimal-ipv6/cloudformation.json.extracted.yaml | 4 ++-- ...est-1a.masters.minimal-ipv6.example.com_user_data | 4 ++-- ...est-1a.masters.minimal-json.example.com_user_data | 4 ++-- .../minimal/cloudformation.json.extracted.yaml | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- ...a-minimal-gce-example-com_metadata_startup-script | 4 ++-- ...l-gce-private-example-com_metadata_startup-script | 4 ++-- ...er-us-test-1a.masters.minimal.k8s.local_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 12 ++++++------ ...t-1a.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1b.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1c.masters.mixedinstances.example.com_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 12 ++++++------ ...t-1a.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1b.masters.mixedinstances.example.com_user_data | 4 ++-- ...t-1c.masters.mixedinstances.example.com_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 4 ++-- ...-1a.masters.nthsqsresources.example.com_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 4 ++-- ...a.masters.private-shared-ip.example.com_user_data | 4 ++-- ...sters.private-shared-subnet.example.com_user_data | 4 ++-- .../privatecalico/cloudformation.json.extracted.yaml | 4 ++-- ...st-1a.masters.privatecalico.example.com_user_data | 4 ++-- ...est-1a.masters.privatecanal.example.com_user_data | 4 ++-- .../privatecilium/cloudformation.json.extracted.yaml | 4 ++-- ...st-1a.masters.privatecilium.example.com_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 2 +- ...st-1a.masters.privatecilium.example.com_user_data | 4 ++-- .../cloudformation.json.extracted.yaml | 4 ++-- ...sters.privateciliumadvanced.example.com_user_data | 4 ++-- ...test-1a.masters.privatedns1.example.com_user_data | 4 ++-- ...test-1a.masters.privatedns2.example.com_user_data | 4 ++-- ...t-1a.masters.privateflannel.example.com_user_data | 4 ++-- ...st-1a.masters.privatekopeio.example.com_user_data | 4 ++-- ...est-1a.masters.privateweave.example.com_user_data | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- ...est-1a.masters.sharedsubnet.example.com_user_data | 4 ++-- ...s-test-1a.masters.sharedvpc.example.com_user_data | 4 ++-- ...s-test-1a.masters.unmanaged.example.com_user_data | 4 ++-- ...-us-test-1a.masters.minimal.example.com_user_data | 4 ++-- 69 files changed, 143 insertions(+), 143 deletions(-) diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index b7fb0b336007d..9312757cca979 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -120,8 +120,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b1402ccef46fa..c01d72eb0247a 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 057e086d36167..b03e0634a6d49 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index 845908e218f59..e58b31a264319 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -53,7 +53,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. \ - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n - PersistentVolumeLabel\n \ - DefaultStorageClass\n - DefaultTolerationSeconds\n - MutatingAdmissionWebhook\n \ - ValidatingAdmissionWebhook\n - NodeRestriction\n - ResourceQuota\n etcdServers:\n - \ - http://127.0.0.1:4001\n etcdServersOverrides:\n - /events#http://127.0.0.1:4002\n + \ - https://127.0.0.1:4001\n etcdServersOverrides:\n - /events#https://127.0.0.1:4002\n \ image: k8s.gcr.io/kube-apiserver:v1.21.0\n kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n logLevel: 2\n memoryLimit: 1000Mi\n \ memoryRequest: 800Mi\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index c37ab16c307cc..73824639a0b96 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -183,9 +183,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index 4cb9372742a01..58386f6bd887e 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -128,7 +128,7 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xW3Y8bNRB/z19hFVV96e1mr0eBVSsRcoULvSsh6QcSqpBjTzYmXns7tvcuiD8ejb1JNrk7SukjJFKyni/Px29mVmgb5NiaparKAWM1N7yCubfIKxhr7hy4knkMMBDWeK4M4CwYr2oo2Y4i90xJVkS091MLiEpCyf4cMMZYC+iUNew5Ox1Ewq+NDpUy7n067gnZA2WzvcmswkZkbZEJVA92wv9MvEfvaX6yboYpaHdg5N+boQfx/sAUYx3zN79pgD1nRyZJI2tPHwyOtD7Lhcw2XlkqATv6zDfOQy3HFdrQsOcJA4xpW11CC7pkyiztYFfVkhXZWfZ0IK1YAxII3Fo1E+M817pDEBiBm3hfBzhmgtYD8EKOdXAe0JEitGB8fOpZf5KdZcWTiFBl7uatwwJG08kcsE0ecK3t9RRVqzRUIMttDNxYs6ltcKPgVyVbcu0iuVGjIBUYAfH2E0YW0YAHl7lWZBKWPGifRNM1YxuML1lBtOBXFtUfnAK8soT7kb7mGzciNwaMLZSRIykRnCvZMItfahbqwCnaVknAkvFrRzkwfKFhJGvlKMZpKnHy6hWvwTVcwKVagtgIDZF8qWrlZ9xUgPFMDioBIyHIx0iaUsacB+PfWh1quOQL0JFznkLrN36f/tpqwBjYHIQ1MjGvgudemWrn5jtYrKxdR+ZbrpW8n/3KSpiB86gEmY20GTgbUMDPwXpOSfBCpjR3ka+8b8o8L06/itkryrPhsDgU3A6dTiNPYPriLs3TAWOq5hWUbP21yyqBmbI51fyEN8olGLVFdlrEOhFDg58iLAERtqV8vWm2l02MBzRcT6bxeGGdN7xO1Xlx0+Ptm4h8QPgQwPkVcAkYwQIy1jhZ5VWFUHFv8Vj2xY1HfhEfySt1s1X55WQGtfVwEiVOjvV+oJZOescKkXUs/8aR6zXcrUJcancQAWFq0Zfs7OxJpPQBOHEuEL6pEq7Mc96oTHUJy4StG0pmBje8bjQQ4ZaFH9+9nL+ZTT7BRG4bMErmbZH/fr12e4vduJlMY7+UrBgOs6dnBI08DhmX+uA7LtZgZBkBlgbM2BqPVmvAq7gqd4NGcA8E6vHkfOb2o8Z7LlbnQL8zah2hNMw3RkwBlZUlK+qhu28IiOQlWUwufvM0uVjsmQQU2sR35i/t4YAwJvMzGzxt8+28uwf7YhfhSd2FuG8CnYCnIXZtmsM9Wnl7TRDCg4PDaTRGkGC84nqbKrp6ivZmU3408CbMEjojj+JcdZ22f+N49C2/do/uD7KJV/Xi6vlLAnOxAhl0Ku89NtxO5vPy0w2W8v7NJOISPkdFE4m5tJl39Jm1vmT5R1B0/mrew3kx7HFs3KnbY0ZY1rsddA6LUFXKVBfcSE3tv40B2jS7LzjKktVQW9xkvOVKk96zYji8Uo+NlbB0B+SHW6Kif/c9Ajz78uHjmOVbolvqgezfl5zymZA/5ZTFvOWYa7XIu0Tne4FbSDXgry2u077tessoYlhzxd2HAMhTjx8ODUpnY+UVN2oJzncXgxf5/h0irzuuG9ScMv3y/8L/1wpPm7WiVzDsJgzFu633XwAAAP//AQAA//9BU/tajA0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xW648bNRD/nr/CKqr6pbebvR4FVq1EyBUu9K6EpA8kVCHHnmxMvPZ2bO9dEH88Gns3r7ujlH6ERErW8/I8fjOzQtsgx9YsVVUOGKu54RXMvUVewVhz58CVzGOAgbDGc2UAZ8F4VUPJthS5Y0qyIqK9n1pAVBJK9ueAMcZaQKesYc/Z6SASfm10qJRx79NxR8geKJvtTGYVNiJri0ygerAV/mfie/Q9zU/WzTAF7Q6M/Hsz9CDeH5hirGP+5jcNsOfsyCRpZO3pg8GR1me5kNnGK0slYEef+cZ5qOW4Qhsa9jxhgDFtq0toQZdMmaUdbKtasiI7y54OpBVrQAKBW6tmYpznWncIAiNwE+/rAMdM0HoAXsixDs4DOlKEFoyPT3vWn2RnWfEkIlSZu3nrsIDRdDIHbJMHXGt7PUXVKg0VyLKPgRtrNrUNbhT8qmRLrl0kN2oUpAIjIN5+wsgiGvDgMteKTMKSB+2TaLpmbIPxJSuIFvzKovqDU4BXlnA/0td840bkxoCxhTJyJCWCcyUbZvFLzUIdOEXbKglYMn7tKAeGLzSMZK0cxThNJU5eveI1uIYLuFRLEBuhIZIvVa38jJsKMJ7JQSVgJAT5GElTypjzYPxbq0MNl3wBOnLOU2j7jb9Pf201YAxsDsIamZhXwXOvTLV18x0sVtauI/Mt10rez35lJczAeVSCzEbaDJwNKODnYD2nJHghU5q7yFfeN67M8+L0q5i+ojwbDotDyX7qdCp5QtMXd6qeDhhTNa+gZOuvXVYJzJTNqeonvFEuAaktstMiVooYGvwUYQmI0Bfz9abpb5sYD2i4nkzj8cI6b3id6vPiZo+3ayPyAeFDAOdXwCVghAvIWOVklVcVQsW9xWPZFzce+UV8JK/UTa/yy8kMauvhJEqcHOv9QE2d9I4VIutY/o0j12u4W4W41PAgAsLUoi/Z2dmTSNmH4MS5QAjvS8EblakuYZmwdUPJzOCG140GItyy8OO7l/M3s8knmMhtA0bJvC3y36/XbmexGziTaeyYkhXDYfb0jKCRxzHjUid8x8UajCwjwtKIGVvj0WoNeBWX5XbUCO6BYD2enM/cbth4z8XqHOh3Rs0jlIb5xogpoLKyZEU9dPeNAZG8JIvJxW+eJheLHZOAQrv4zvylTRwQxmR+ZoOnfd5PvHuwL7YRntRdiLsm0Al4GmLfpkm8RytvLwpCeHBwOI/GCBKMV1z3qaKrp2hvNuVHA2/CLKEz8ijOVddpu3eOR9/ya/fo/iCbeNVeXHv+ksBcrEAGncp7jw23lfm8/HSDpbx/N4m4hs9R0URiLu3mLX1mrS9Z/hEUnb+a7+G8GO5xbNyq/TEjLOvtFjqHRagqZaoLbqSm9u9jgDZN7wuOsmQ11BY3GW+50qT3rBgOr9RjYyUs3QH5YU9U9O++R4BnXz58HLN8S7SnHsj+fckpnwn5U05ZzFuOuVaLvEt0vhO4hVQD/triOm3crreMIoY1V9x9CIA89fjh0KB0NlZecaOW4Hx3MXiR794i8rrjukHNKdMv/y/8f63wtFkregnDbsJQvH29/wIAAP//AQAA///JK3mEjg0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index 49506a9f007ee..1a74dfc6bbe15 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -55,8 +55,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti \ cloudProvider: aws\n enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n \ - ServiceAccount\n - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 9441446e6b493..c16ef2c105799 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index cba2123f0f49f..9f0e50d946cbc 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -51,8 +51,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index cd9784f1fb542..6042814eeda1f 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index c88948236312c..dcdbff49532e0 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index 4925879b0b613..57494cf045f1c 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index d948d41d1de9b..b56434bfc01ac 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 5809f541d1c2f..5e4eda7df7ec5 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index 4d3293cd5fcce..934542a94e48e 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 3121e1d0a6050..1b1763d1af997 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index e095855c3d22e..01269d96c7c0a 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index ea599e1400aa9..9d72add5eb641 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 075becb6a8c06..33088db4713cc 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -172,9 +172,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index 3c4864a00dea6..78b9276ca9c0d 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 5a9f2d75f9611..1ee59d64c3b80 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index 23b8f2974807f..f147130bd5f42 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index aee284247320a..49e34bd6f78bc 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -173,9 +173,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 88c364e9f844a..c3063ba093636 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -173,9 +173,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index d81dd20db392c..a353dfa2d216c 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -173,9 +173,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e1754bf17309d..573d41655e7a3 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.20.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index ee849e32b680b..a160395350ecc 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -54,8 +54,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index a477beb8e9c16..ddfbf81628be5 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -50,8 +50,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. \ cloudProvider: aws\n enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n \ - ServiceAccount\n - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 601f5ef11ffbc..888611824cf5a 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -177,9 +177,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index 5062eea1948ab..5fce87ccc8613 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 86ab497b591b4..759956d42f1a3 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data index 904c44090531b..5ac7ecffc5b9b 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index d948d41d1de9b..b56434bfc01ac 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a75fc4d0be37b..15b293cbecfea 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git 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 index 3ea3b204ff15b..55b317d996308 100644 --- 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 @@ -173,9 +173,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 28534d6d6ac86..e36a260cc59b7 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -173,9 +173,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index ed3774cf0555d..c0afc52213fe5 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index e89bfc98af622..679716ab7ecc5 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n @@ -154,8 +154,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n @@ -259,8 +259,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 3a2e34aac6436..cb84e05f014bb 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 86d80a1a63608..d3f964e93fbd3 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index b9fed1adf9aa8..b37ae87619a0a 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index e89bfc98af622..679716ab7ecc5 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n @@ -154,8 +154,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n @@ -259,8 +259,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index 3a2e34aac6436..cb84e05f014bb 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index 86d80a1a63608..d3f964e93fbd3 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index b9fed1adf9aa8..b37ae87619a0a 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index 0eae1f0122671..5a8d0fd33629c 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml @@ -49,8 +49,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.20.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.20.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data index e55258d1f7aaa..43d825fcbb39b 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.20.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index e5189f383f5e0..a40bdaa2a33c6 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml @@ -50,8 +50,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index a0df83e323522..ef865d7b47ecd 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index ebf0c8ddd0718..dc7e5bb7b70ac 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index 94b6ddd0037e8..dfa2a7b8c6e90 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -50,8 +50,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index 427df71c3f2c6..1cc57df3339f8 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git 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 index bda29e696b864..d9eed534f3368 100644 --- 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 @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index b7589d23975b3..f138c80006f5a 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -50,8 +50,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope \ enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n \ - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index a0b7a15103d04..f806fe4f7f4b6 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 363d66df68b1e..c98db5329a2b4 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -47,7 +47,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope \ - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n - PersistentVolumeLabel\n \ - DefaultStorageClass\n - DefaultTolerationSeconds\n - MutatingAdmissionWebhook\n \ - ValidatingAdmissionWebhook\n - NodeRestriction\n - ResourceQuota\n etcdServers:\n - \ - http://127.0.0.1:4001\n etcdServersOverrides:\n - /events#http://127.0.0.1:4002\n + \ - https://127.0.0.1:4001\n etcdServersOverrides:\n - /events#https://127.0.0.1:4002\n \ image: k8s.gcr.io/kube-apiserver:v1.17.15\n kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n logLevel: 2\n requestheaderAllowedNames:\n \ - aggregator\n requestheaderExtraHeaderPrefixes:\n - X-Remote-Extra-\n requestheaderGroupHeaders:\n diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index f488bfd1f4944..3db71305c6144 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -162,9 +162,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.17.15 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index 0a492f169185b..90956331ef18a 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -50,8 +50,8 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec \ cloudProvider: aws\n enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n \ - ServiceAccount\n - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n \ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n - \ - ResourceQuota\n etcdServers:\n - http://127.0.0.1:4001\n etcdServersOverrides:\n - \ - /events#http://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n + \ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n + \ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.21.0\n \ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n \ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n \ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index f3f89e8ebb75b..09b39dd078a13 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -173,9 +173,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 1cae9ba1153a4..18f1113fd78c2 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index db0cd607a20ce..397f0e39c8546 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index a3447bda671d0..0d4cf3bb4fda9 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 12e29e266d5bc..de74cf28a7f6a 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index b02f9471d8b51..200a27b6f7fc9 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 762e760abed66..c58201c7e8fa4 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -164,9 +164,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 featureGates: ServiceAccountIssuerDiscovery: "true" image: k8s.gcr.io/kube-apiserver:v1.19.0 diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index ee0fde1f38b83..713afc0697cde 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 88da1d847410b..5044f6878f8c7 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index de15ffeaacb45..d12bdb0b5e89c 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b1402ccef46fa..c01d72eb0247a 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -171,9 +171,9 @@ kubeAPIServer: - NodeRestriction - ResourceQuota etcdServers: - - http://127.0.0.1:4001 + - https://127.0.0.1:4001 etcdServersOverrides: - - /events#http://127.0.0.1:4002 + - /events#https://127.0.0.1:4002 image: k8s.gcr.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP