From 74afb7aed0683c3049750d89547ebec9aa540fe3 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sun, 18 Sep 2022 07:01:52 +0200 Subject: [PATCH] Remove checks for k8s < 1.21 --- nodeup/pkg/model/miscutils.go | 21 +------------------ .../containerdbuilder/flatcar/cluster.yaml | 2 +- .../from_docker_19.03.11/cluster.yaml | 2 +- .../from_docker_19.03.14/cluster.yaml | 2 +- .../containerdbuilder/simple/cluster.yaml | 2 +- .../skipinstall/cluster.yaml | 2 +- .../docker_19.03.11/cluster.yaml | 2 +- .../tests/dockerbuilder/logflags/cluster.yaml | 2 +- .../dockerbuilder/skipinstall/cluster.yaml | 2 +- .../model/tests/golden/awsiam/cluster.yaml | 2 +- .../golden/awsiam/tasks-kube-apiserver.yaml | 2 +- .../golden/dedicated-apiserver/cluster.yaml | 2 +- .../tasks-kube-apiserver.yaml | 2 +- .../golden/without-etcd-events/cluster.yaml | 2 +- .../tasks-kube-apiserver.yaml | 2 +- nodeup/pkg/model/tests/protokube/cluster.yaml | 2 +- .../automatic/cluster.yaml | 2 +- .../external/cluster.yaml | 2 +- pkg/apis/kops/validation/legacy.go | 3 +-- pkg/apis/kops/validation/validation.go | 7 +------ pkg/model/components/apiserver.go | 16 ++------------ pkg/model/components/defaults.go | 2 +- pkg/model/components/docker.go | 6 +----- .../etcdmanager/tests/interval/cluster.yaml | 2 +- .../etcdmanager/tests/minimal/cluster.yaml | 2 +- .../tests/overwrite_settings/cluster.yaml | 2 +- .../etcdmanager/tests/proxy/cluster.yaml | 2 +- .../kubeapiserver/tests/minimal/cluster.yaml | 2 +- pkg/model/components/kubecontrollermanager.go | 10 ++------- pkg/model/components/kubelet.go | 12 +++-------- pkg/model/components/kubescheduler.go | 10 ++------- .../integration/conversion/aws/v1alpha2.yaml | 2 +- .../integration/conversion/aws/v1alpha3.yaml | 2 +- .../conversion/azure/v1alpha2.yaml | 2 +- .../conversion/azure/v1alpha3.yaml | 2 +- .../conversion/canal/v1alpha2.yaml | 2 +- .../conversion/canal/v1alpha3.yaml | 2 +- .../conversion/cilium/v1alpha2.yaml | 2 +- .../conversion/cilium/v1alpha3.yaml | 2 +- tests/integration/conversion/do/v1alpha2.yaml | 2 +- tests/integration/conversion/do/v1alpha3.yaml | 2 +- .../integration/conversion/gce/v1alpha2.yaml | 2 +- .../integration/conversion/gce/v1alpha3.yaml | 2 +- .../conversion/minimal/legacy-v1alpha2.yaml | 2 +- .../conversion/minimal/v1alpha2.yaml | 2 +- .../conversion/minimal/v1alpha3.yaml | 2 +- .../conversion/openstack/v1alpha2.yaml | 2 +- .../conversion/openstack/v1alpha3.yaml | 2 +- ...-test-1a.masters.123.example.com_user_data | 14 ++++++++----- ...h_template_nodes.123.example.com_user_data | 6 ++++-- ...s_s3_object_cluster-completed.spec_content | 14 ++++++++----- ...ect_nodeupconfig-master-us-test-1a_content | 12 ++++++----- .../aws_s3_object_nodeupconfig-nodes_content | 10 +++++---- .../update_cluster/digit/in-v1alpha2.yaml | 2 +- ...t-1a.masters.minimal.example.com_user_data | 14 ++++++++----- ...mplate_nodes.minimal.example.com_user_data | 6 ++++-- ...s_s3_object_cluster-completed.spec_content | 14 ++++++++----- ...ect_nodeupconfig-master-us-test-1a_content | 12 ++++++----- .../aws_s3_object_nodeupconfig-nodes_content | 10 +++++---- .../update_cluster/irsa/in-v1alpha2.yaml | 2 +- .../cloudformation.json.extracted.yaml | 20 +++++++++++------- ...rces.longclustername.example.com_user_data | 14 ++++++++----- ...rces.longclustername.example.com_user_data | 6 ++++-- ...s_s3_object_cluster-completed.spec_content | 14 ++++++++----- ...ect_nodeupconfig-master-us-test-1a_content | 12 ++++++----- .../aws_s3_object_nodeupconfig-nodes_content | 10 +++++---- .../nth_sqs_resources/in-v1alpha2.yaml | 2 +- .../fi/cloudup/populate_cluster_spec_test.go | 4 ---- .../amazonvpc-containerd/cluster.yaml | 2 +- .../amazonvpc/cluster.yaml | 2 +- ...oud-controller.addons.k8s.io-k8s-1.18.yaml | 2 +- .../awscloudcontroller/cluster.yaml | 2 +- .../awscloudcontroller/manifest.yaml | 2 +- .../awsiamauthenticator/crd/cluster.yaml | 2 +- .../awsiamauthenticator/mappings/cluster.yaml | 2 +- .../coredns/cluster.yaml | 2 +- .../metrics-server/insecure-1.19/cluster.yaml | 2 +- .../insecure-1.19/manifest.yaml | 9 +++++++- .../metrics-server/secure-1.19/cluster.yaml | 2 +- .../metrics-server/secure-1.19/manifest.yaml | 9 +++++++- .../service-account-iam/cluster.yaml | 2 +- .../service-account-iam/manifest.yaml | 9 +++++++- .../simple/cluster.yaml | 2 +- .../weave/cluster.yaml | 2 +- 84 files changed, 211 insertions(+), 205 deletions(-) diff --git a/nodeup/pkg/model/miscutils.go b/nodeup/pkg/model/miscutils.go index f7006ed7c8..29227f0db3 100644 --- a/nodeup/pkg/model/miscutils.go +++ b/nodeup/pkg/model/miscutils.go @@ -43,21 +43,7 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error { } var packages []string - if b.Distribution.IsDebianFamily() { - if b.IsKubernetesLT("1.20") { - packages = append(packages, "curl") - packages = append(packages, "wget") - packages = append(packages, "perl") - packages = append(packages, "apt-transport-https") - - // TODO: Do we really need python-apt? - if (b.Distribution.IsUbuntu() && b.Distribution.Version() >= 20.10) || (!b.Distribution.IsUbuntu() && b.Distribution.Version() >= 11) { - // python-apt not available (though python3-apt is) - } else { - packages = append(packages, "python-apt") - } - } - } else if b.Distribution.IsRHELFamily() { + if b.Distribution.IsRHELFamily() { // TODO: These packages have been auto-installed for a long time, and likely we don't need all of them any longer packages = append(packages, "curl") packages = append(packages, "wget") @@ -68,11 +54,6 @@ func (b *MiscUtilsBuilder) Build(c *fi.ModelBuilderContext) error { return nil } - if b.Distribution.IsUbuntu() && b.IsKubernetesLT("1.20") { - packages = append(packages, "netcat-traditional") - packages = append(packages, "git") - } - for _, p := range packages { c.AddTask(&nodetasks.Package{Name: p}) } diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml index 5687bd6b00..f282eeeb59 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml index d981105d52..5e3d558a2c 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml index b5cde1e4e5..63a80d2177 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml index 5687bd6b00..f282eeeb59 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml index f13849605a..fbbe7a31e4 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.3 + kubernetesVersion: v1.22.3 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml index 6c58e92e6d..082048a667 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml @@ -23,7 +23,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml index 3e99c1dcb7..0bf756f11b 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.logflags.example.com masterPublicName: api.logflags.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml index 6d73b3896c..a3c1926892 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: legacy: false - kubernetesVersion: v1.20.6 + kubernetesVersion: v1.22.6 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml b/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml index f9eec58424..94d19b0864 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/cluster.yaml @@ -32,7 +32,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml index 16939fc2ee..6b3b7ec8b7 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -76,7 +76,7 @@ contents: | - --log-file=/var/log/kube-apiserver.log command: - /usr/local/bin/kube-apiserver - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml index 6a9942343f..7760a8f56e 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml @@ -30,7 +30,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml index 20ab58699a..17a927b927 100644 --- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml @@ -54,7 +54,7 @@ contents: | - --log-file=/var/log/kube-apiserver.log command: - /usr/local/bin/kube-apiserver - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml index 7e8d786a4d..8543db732f 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml @@ -21,7 +21,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml index 8d118a55e0..27d6ce6518 100644 --- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml @@ -53,7 +53,7 @@ contents: | - --log-file=/var/log/kube-apiserver.log command: - /usr/local/bin/kube-apiserver - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/nodeup/pkg/model/tests/protokube/cluster.yaml b/nodeup/pkg/model/tests/protokube/cluster.yaml index d201250e22..44cee66cdf 100644 --- a/nodeup/pkg/model/tests/protokube/cluster.yaml +++ b/nodeup/pkg/model/tests/protokube/cluster.yaml @@ -26,7 +26,7 @@ spec: iam: {} kubelet: hostnameOverride: master.hostname.invalid - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml b/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml index d201250e22..44cee66cdf 100644 --- a/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml +++ b/nodeup/pkg/model/tests/updateservicebuilder/automatic/cluster.yaml @@ -26,7 +26,7 @@ spec: iam: {} kubelet: hostnameOverride: master.hostname.invalid - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml b/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml index e0f49f031a..0edc4d5e01 100644 --- a/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml +++ b/nodeup/pkg/model/tests/updateservicebuilder/external/cluster.yaml @@ -26,7 +26,7 @@ spec: iam: {} kubelet: hostnameOverride: master.hostname.invalid - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/pkg/apis/kops/validation/legacy.go b/pkg/apis/kops/validation/legacy.go index 7ffcb09e50..86f4e9b6cf 100644 --- a/pkg/apis/kops/validation/legacy.go +++ b/pkg/apis/kops/validation/legacy.go @@ -59,7 +59,6 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList { optionTaken := false if c.Spec.CloudProvider.AWS != nil { optionTaken = true - } if c.Spec.CloudProvider.Azure != nil { if optionTaken { @@ -289,7 +288,7 @@ func ValidateCluster(c *kops.Cluster, strict bool) field.ErrorList { // @ check that NodeLocalDNS addon is configured correctly if c.Spec.KubeDNS.NodeLocalDNS != nil && fi.BoolValue(c.Spec.KubeDNS.NodeLocalDNS.Enabled) { - if c.Spec.KubeDNS.Provider != "CoreDNS" && (c.Spec.KubeDNS.Provider != "" || c.IsKubernetesLT("1.20")) { + if c.Spec.KubeDNS.Provider != "CoreDNS" && c.Spec.KubeDNS.Provider != "" { allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("kubeDNS", "provider"), "KubeDNS provider must be set to CoreDNS if NodeLocalDNS addon is enabled")) } diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 01749cbcf8..ff9999fe32 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -298,9 +298,6 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie if !featureflag.Karpenter.Enabled() { allErrs = append(allErrs, field.Forbidden(fieldPath.Child("karpenter", "enabled"), "karpenter requires the Karpenter feature flag")) } - if c.IsKubernetesLT("1.21") { - allErrs = append(allErrs, field.Forbidden(fieldPath.Child("karpenter", "enabled"), "karpenter requires Kubernetes 1.21 or greater")) - } } if spec.PodIdentityWebhook != nil && spec.PodIdentityWebhook.Enabled { @@ -737,9 +734,7 @@ func validateKubelet(k *kops.KubeletConfigSpec, c *kops.Cluster, kubeletPath *fi } if k.EnableCadvisorJsonEndpoints != nil { - if c.IsKubernetesGTE("1.21") { - allErrs = append(allErrs, field.Forbidden(kubeletPath.Child("enableCadvisorJsonEndpoints"), "enableCadvisorJsonEndpoints requires Kubernetes 1.18-1.20")) - } + allErrs = append(allErrs, field.Forbidden(kubeletPath.Child("enableCadvisorJsonEndpoints"), "enableCadvisorJsonEndpoints requires Kubernetes 1.18-1.20")) } if k.LogFormat != "" { diff --git a/pkg/model/components/apiserver.go b/pkg/model/components/apiserver.go index 9dade8927b..32c0ae58b7 100644 --- a/pkg/model/components/apiserver.go +++ b/pkg/model/components/apiserver.go @@ -181,14 +181,8 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error { if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.BoolValue(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) { - if b.IsKubernetesLT("1.21.0") { - if _, found := c.FeatureGates["CSIMigrationAWSComplete"]; !found { - c.FeatureGates["CSIMigrationAWSComplete"] = "true" - } - } else { - if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found { - c.FeatureGates["InTreePluginAWSUnregister"] = "true" - } + if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found { + c.FeatureGates["InTreePluginAWSUnregister"] = "true" } if _, found := c.FeatureGates["CSIMigrationAWS"]; !found { @@ -196,12 +190,6 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error { } } - if b.IsKubernetesLT("1.20") && clusterSpec.ServiceAccountIssuerDiscovery != nil && fi.BoolValue(&clusterSpec.ServiceAccountIssuerDiscovery.EnableAWSOIDCProvider) { - if _, found := c.FeatureGates["ServiceAccountIssuerDiscovery"]; !found { - c.FeatureGates["ServiceAccountIssuerDiscovery"] = "true" - } - } - return nil } diff --git a/pkg/model/components/defaults.go b/pkg/model/components/defaults.go index 6b31116b29..ef6b1ddf15 100644 --- a/pkg/model/components/defaults.go +++ b/pkg/model/components/defaults.go @@ -37,7 +37,7 @@ func (b *DefaultsOptionsBuilder) BuildOptions(o interface{}) error { } if options.ContainerRuntime == "" { - if b.Context.IsKubernetesLT("1.20") || options.Docker != nil { + if options.Docker != nil { options.ContainerRuntime = "docker" } else { options.ContainerRuntime = "containerd" diff --git a/pkg/model/components/docker.go b/pkg/model/components/docker.go index f7e1ed81e7..86a2ed4a88 100644 --- a/pkg/model/components/docker.go +++ b/pkg/model/components/docker.go @@ -47,11 +47,7 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error { // Set the Docker version for known Kubernetes versions if fi.StringValue(clusterSpec.Docker.Version) == "" { - if b.IsKubernetesGTE("1.21") { - docker.Version = fi.String("20.10.17") - } else { - docker.Version = fi.String("19.03.15") - } + docker.Version = fi.String("20.10.17") } if len(clusterSpec.Docker.LogOpt) == 0 && clusterSpec.Docker.LogDriver == nil { diff --git a/pkg/model/components/etcdmanager/tests/interval/cluster.yaml b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml index 5bfc358662..70a0f75f4b 100644 --- a/pkg/model/components/etcdmanager/tests/interval/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml @@ -33,7 +33,7 @@ spec: provider: Manager backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml index fa7e57e97a..6c15a3f1ff 100644 --- a/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/minimal/cluster.yaml @@ -28,7 +28,7 @@ spec: provider: Manager backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml index 85a6b48e67..f855917e64 100644 --- a/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/overwrite_settings/cluster.yaml @@ -38,7 +38,7 @@ spec: provider: Manager backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml b/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml index 43ff7ead6a..31e7bd1107 100644 --- a/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml +++ b/pkg/model/components/etcdmanager/tests/proxy/cluster.yaml @@ -32,7 +32,7 @@ spec: provider: Manager backups: backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml b/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml index 0731c9a8fb..dd84042b19 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml @@ -9,7 +9,7 @@ spec: channel: stable cloudProvider: aws configBase: memfs://clusters.example.com/minimal.example.com - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go index 49267762ef..6d20b5c2ab 100644 --- a/pkg/model/components/kubecontrollermanager.go +++ b/pkg/model/components/kubecontrollermanager.go @@ -186,14 +186,8 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error kcm.FeatureGates = make(map[string]string) } - if b.IsKubernetesLT("1.21.0") { - if _, found := kcm.FeatureGates["CSIMigrationAWSComplete"]; !found { - kcm.FeatureGates["CSIMigrationAWSComplete"] = "true" - } - } else { - if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found { - kcm.FeatureGates["InTreePluginAWSUnregister"] = "true" - } + if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found { + kcm.FeatureGates["InTreePluginAWSUnregister"] = "true" } if _, found := kcm.FeatureGates["CSIMigrationAWS"]; !found { diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go index fa2fa72625..d47519a91f 100644 --- a/pkg/model/components/kubelet.go +++ b/pkg/model/components/kubelet.go @@ -193,14 +193,8 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"] = "true" } - if b.IsKubernetesLT("1.21.0") { - if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWSComplete"]; !found { - clusterSpec.Kubelet.FeatureGates["CSIMigrationAWSComplete"] = "true" - } - } else { - if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found { - clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true" - } + if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found { + clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true" } } @@ -215,7 +209,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error { // We do not enable graceful shutdown when using amazonaws due to leaking ENIs. // Graceful shutdown is also not available by default on k8s < 1.21 - if b.IsKubernetesGTE("1.21") && clusterSpec.Kubelet.ShutdownGracePeriod == nil && clusterSpec.Networking.AmazonVPC == nil { + if clusterSpec.Kubelet.ShutdownGracePeriod == nil && clusterSpec.Networking.AmazonVPC == nil { clusterSpec.Kubelet.ShutdownGracePeriod = &metav1.Duration{Duration: time.Duration(30 * time.Second)} clusterSpec.Kubelet.ShutdownGracePeriodCriticalPods = &metav1.Duration{Duration: time.Duration(10 * time.Second)} } else if clusterSpec.Networking.AmazonVPC != nil { diff --git a/pkg/model/components/kubescheduler.go b/pkg/model/components/kubescheduler.go index 175caa70e3..713bb47474 100644 --- a/pkg/model/components/kubescheduler.go +++ b/pkg/model/components/kubescheduler.go @@ -63,14 +63,8 @@ func (b *KubeSchedulerOptionsBuilder) BuildOptions(o interface{}) error { config.FeatureGates = make(map[string]string) } - if b.IsKubernetesLT("1.21.0") { - if _, found := config.FeatureGates["CSIMigrationAWSComplete"]; !found { - config.FeatureGates["CSIMigrationAWSComplete"] = "true" - } - } else { - if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found { - config.FeatureGates["InTreePluginAWSUnregister"] = "true" - } + if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found { + config.FeatureGates["InTreePluginAWSUnregister"] = "true" } if _, found := config.FeatureGates["CSIMigrationAWS"]; !found { diff --git a/tests/integration/conversion/aws/v1alpha2.yaml b/tests/integration/conversion/aws/v1alpha2.yaml index da9f9033e1..e4bb4988cd 100644 --- a/tests/integration/conversion/aws/v1alpha2.yaml +++ b/tests/integration/conversion/aws/v1alpha2.yaml @@ -41,7 +41,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/aws/v1alpha3.yaml b/tests/integration/conversion/aws/v1alpha3.yaml index 4d4ab76cee..617225e0bb 100644 --- a/tests/integration/conversion/aws/v1alpha3.yaml +++ b/tests/integration/conversion/aws/v1alpha3.yaml @@ -40,7 +40,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/azure/v1alpha2.yaml b/tests/integration/conversion/azure/v1alpha2.yaml index 859d41d5df..e5f6ce84f1 100644 --- a/tests/integration/conversion/azure/v1alpha2.yaml +++ b/tests/integration/conversion/azure/v1alpha2.yaml @@ -38,7 +38,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/azure/v1alpha3.yaml b/tests/integration/conversion/azure/v1alpha3.yaml index eb33b151ed..6e0c320174 100644 --- a/tests/integration/conversion/azure/v1alpha3.yaml +++ b/tests/integration/conversion/azure/v1alpha3.yaml @@ -36,7 +36,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/canal/v1alpha2.yaml b/tests/integration/conversion/canal/v1alpha2.yaml index 4b9bc7ec31..80f55feb7e 100644 --- a/tests/integration/conversion/canal/v1alpha2.yaml +++ b/tests/integration/conversion/canal/v1alpha2.yaml @@ -32,7 +32,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/canal/v1alpha3.yaml b/tests/integration/conversion/canal/v1alpha3.yaml index 2fdf109d62..acc8dd3858 100644 --- a/tests/integration/conversion/canal/v1alpha3.yaml +++ b/tests/integration/conversion/canal/v1alpha3.yaml @@ -32,7 +32,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/cilium/v1alpha2.yaml b/tests/integration/conversion/cilium/v1alpha2.yaml index 8098858872..410aba076c 100644 --- a/tests/integration/conversion/cilium/v1alpha2.yaml +++ b/tests/integration/conversion/cilium/v1alpha2.yaml @@ -32,7 +32,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/cilium/v1alpha3.yaml b/tests/integration/conversion/cilium/v1alpha3.yaml index d4ab4a81e1..847e25c357 100644 --- a/tests/integration/conversion/cilium/v1alpha3.yaml +++ b/tests/integration/conversion/cilium/v1alpha3.yaml @@ -32,7 +32,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/do/v1alpha2.yaml b/tests/integration/conversion/do/v1alpha2.yaml index 03211dac4b..e0d9bf7526 100644 --- a/tests/integration/conversion/do/v1alpha2.yaml +++ b/tests/integration/conversion/do/v1alpha2.yaml @@ -31,7 +31,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/do/v1alpha3.yaml b/tests/integration/conversion/do/v1alpha3.yaml index 9b13bedbda..51c542b366 100644 --- a/tests/integration/conversion/do/v1alpha3.yaml +++ b/tests/integration/conversion/do/v1alpha3.yaml @@ -30,7 +30,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/gce/v1alpha2.yaml b/tests/integration/conversion/gce/v1alpha2.yaml index ca9b9069e6..080174d49b 100644 --- a/tests/integration/conversion/gce/v1alpha2.yaml +++ b/tests/integration/conversion/gce/v1alpha2.yaml @@ -31,7 +31,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/gce/v1alpha3.yaml b/tests/integration/conversion/gce/v1alpha3.yaml index e5c0bbdf7f..7f11ce79aa 100644 --- a/tests/integration/conversion/gce/v1alpha3.yaml +++ b/tests/integration/conversion/gce/v1alpha3.yaml @@ -30,7 +30,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml index 279781f3ac..b9578e94c3 100644 --- a/tests/integration/conversion/minimal/legacy-v1alpha2.yaml +++ b/tests/integration/conversion/minimal/legacy-v1alpha2.yaml @@ -32,7 +32,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/minimal/v1alpha2.yaml b/tests/integration/conversion/minimal/v1alpha2.yaml index 78efc635d9..4da1d9252c 100644 --- a/tests/integration/conversion/minimal/v1alpha2.yaml +++ b/tests/integration/conversion/minimal/v1alpha2.yaml @@ -32,7 +32,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/minimal/v1alpha3.yaml b/tests/integration/conversion/minimal/v1alpha3.yaml index a6c547003a..84fa37c09d 100644 --- a/tests/integration/conversion/minimal/v1alpha3.yaml +++ b/tests/integration/conversion/minimal/v1alpha3.yaml @@ -32,7 +32,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/openstack/v1alpha2.yaml b/tests/integration/conversion/openstack/v1alpha2.yaml index cf2528d8e5..7df470663f 100644 --- a/tests/integration/conversion/openstack/v1alpha2.yaml +++ b/tests/integration/conversion/openstack/v1alpha2.yaml @@ -47,7 +47,7 @@ spec: legacy: false kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/conversion/openstack/v1alpha3.yaml b/tests/integration/conversion/openstack/v1alpha3.yaml index 5c1bb952a6..a6af683f4e 100644 --- a/tests/integration/conversion/openstack/v1alpha3.yaml +++ b/tests/integration/conversion/openstack/v1alpha3.yaml @@ -45,7 +45,7 @@ spec: iam: {} kubernetesAPIAccess: - 0.0.0.0/0 - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index 6fdad1f5b1..2972e01edb 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -162,7 +162,7 @@ kubeAPIServer: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -188,7 +188,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: 123.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -196,10 +196,10 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -217,6 +217,8 @@ kubelet: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -232,6 +234,8 @@ masterKubelet: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -240,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: aSESxiNkzlEteRXSMSUwAliHhnaD+t1LL/hwlA+tiO8= +NodeupConfigHash: irccjKkFGJLvUyf0gpEE516RAgTCdIIdKm5+djS8Zwk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index aa85a76c05..98e2d4acd4 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -136,7 +136,7 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: anonymousAuth: false @@ -152,6 +152,8 @@ kubelet: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -160,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PIKG704Lt9sBVVcL/8u7Lx9XR2dlyOvbkb6mhuQ4lNw= +NodeupConfigHash: ZM3qqfbnaMyrGlV3MCLq3YHy/Zd1EvS3mLaYZ+F3N8s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index 22c8c4fb27..1de5276e5d 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -89,7 +89,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -115,7 +115,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: 123.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -137,10 +137,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -158,9 +158,11 @@ spec: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.20.0 + kubernetesVersion: 1.21.0 masterInternalName: api.internal.123.example.com masterKubelet: anonymousAuth: false @@ -177,6 +179,8 @@ spec: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterPublicName: api.123.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1cbdf7eb66..2f025e6fc3 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -22,7 +22,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -52,15 +52,15 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl + - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet + - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl + - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet + - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 @@ -258,6 +258,8 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s UpdatePolicy: automatic channels: - memfs://clusters.example.com/123.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content index b6d3c1981a..f479c2a3d9 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,12 +1,12 @@ Assets: amd64: - - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl + - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet + - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz arm64: - - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl + - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet + - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz CAs: @@ -54,6 +54,8 @@ KubeletConfig: node-role.kubernetes.io/node: "" podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s UpdatePolicy: automatic channels: - memfs://clusters.example.com/123.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/digit/in-v1alpha2.yaml b/tests/integration/update_cluster/digit/in-v1alpha2.yaml index 9c8d4fad3a..515a741a21 100644 --- a/tests/integration/update_cluster/digit/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/digit/in-v1alpha2.yaml @@ -43,7 +43,7 @@ spec: ] kubelet: anonymousAuth: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.123.example.com masterPublicName: api.123.example.com networkCIDR: 172.20.0.0/16 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 a31f643e58..5f5f6da22f 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 @@ -162,7 +162,7 @@ kubeAPIServer: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -188,7 +188,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: minimal.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -196,10 +196,10 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -217,6 +217,8 @@ kubelet: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -232,6 +234,8 @@ masterKubelet: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -240,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: YssZenVBsD/XRxQzNWtiEtosCSwESFczYcFzkrP9PXc= +NodeupConfigHash: F56oipBerHI/IM58aPmR1lXYLb5nkwRq2LaknRGeeNQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 378c358f99..a237d188a8 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -136,7 +136,7 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: anonymousAuth: false @@ -152,6 +152,8 @@ kubelet: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -160,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JBOtZTb7DOhz+wDXNxS8EBauSSH+DsvILeAc8sn2bLI= +NodeupConfigHash: vbE8fon7Gz+yUJcoRvevJp6c22GnUv6MsvhgR0aUJfs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index 5a32cf59f5..a719019f6a 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -96,7 +96,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -122,7 +122,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: minimal.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -144,10 +144,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -165,9 +165,11 @@ spec: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.20.0 + kubernetesVersion: 1.21.0 masterInternalName: api.internal.minimal.example.com masterKubelet: anonymousAuth: false @@ -184,6 +186,8 @@ spec: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index ff7e42b4a5..f5aa57071a 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -22,7 +22,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -52,15 +52,15 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl + - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet + - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl + - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet + - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 @@ -258,6 +258,8 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content index edff2b4d14..2985309644 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,12 +1,12 @@ Assets: amd64: - - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl + - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet + - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz arm64: - - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl + - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet + - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz CAs: @@ -54,6 +54,8 @@ KubeletConfig: node-role.kubernetes.io/node: "" podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/irsa/in-v1alpha2.yaml b/tests/integration/update_cluster/irsa/in-v1alpha2.yaml index eda185e3b6..c15cd40487 100644 --- a/tests/integration/update_cluster/irsa/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/irsa/in-v1alpha2.yaml @@ -50,7 +50,7 @@ spec: ] kubelet: anonymousAuth: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 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 ea53f6c81a..38fca7bd39 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 @@ -164,7 +164,7 @@ - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -190,7 +190,7 @@ clusterCIDR: 100.96.0.0/11 clusterName: nthsqsresources.longclustername.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -198,10 +198,10 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -219,6 +219,8 @@ networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -234,6 +236,8 @@ podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -242,7 +246,7 @@ ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: NdAmLKXAsP2RbDGxPLKM/Tcd9mcFcyoSf8qua+HQKK0= + NodeupConfigHash: LQD6qMgsWOVM+0tA3geiunASTnTax7BwZ7Z9KTsFcBI= __EOF_KUBE_ENV @@ -387,7 +391,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: anonymousAuth: false @@ -403,6 +407,8 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -411,7 +417,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourceslongclusternameexamplecom.Prop ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: lj7GUK6xNNZJHof3qUNRaie+W+e6N8TcjXlLmHX5bpE= + NodeupConfigHash: zvQ5qxOmSlo/WXfoktauDA6U573u5L25Jh0At+ERVnM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data index 3374951b1d..c5979542d7 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.longclustername.example.com_user_data @@ -162,7 +162,7 @@ kubeAPIServer: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -188,7 +188,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: nthsqsresources.longclustername.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -196,10 +196,10 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -217,6 +217,8 @@ kubelet: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterKubelet: anonymousAuth: false cgroupDriver: systemd @@ -232,6 +234,8 @@ masterKubelet: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -240,7 +244,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: NdAmLKXAsP2RbDGxPLKM/Tcd9mcFcyoSf8qua+HQKK0= +NodeupConfigHash: LQD6qMgsWOVM+0tA3geiunASTnTax7BwZ7Z9KTsFcBI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data index 6b9eecf0bc..c41eb28655 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.longclustername.example.com_user_data @@ -136,7 +136,7 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubelet: anonymousAuth: false @@ -152,6 +152,8 @@ kubelet: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s __EOF_CLUSTER_SPEC @@ -160,7 +162,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthsqsresources.longclustername.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: lj7GUK6xNNZJHof3qUNRaie+W+e6N8TcjXlLmHX5bpE= +NodeupConfigHash: zvQ5qxOmSlo/WXfoktauDA6U573u5L25Jh0At+ERVnM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content index 9d50508b92..bb9248c2bc 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_cluster-completed.spec_content @@ -67,7 +67,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -93,7 +93,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: nthsqsresources.longclustername.example.com configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.20.0 + image: registry.k8s.io/kube-controller-manager:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -115,10 +115,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.20.0 + image: registry.k8s.io/kube-proxy:v1.21.0 logLevel: 2 kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.20.0 + image: registry.k8s.io/kube-scheduler:v1.21.0 leaderElection: leaderElect: true logLevel: 2 @@ -136,9 +136,11 @@ spec: networkPluginName: cni podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.20.0 + kubernetesVersion: 1.21.0 masterInternalName: api.internal.nthsqsresources.longclustername.example.com masterKubelet: anonymousAuth: false @@ -155,6 +157,8 @@ spec: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s masterPublicName: api.nthsqsresources.longclustername.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6c8b9774eb..95dbfcf771 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -22,7 +22,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.20.0 + image: registry.k8s.io/kube-apiserver:v1.21.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -52,15 +52,15 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl + - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet + - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl + - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet + - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 @@ -258,6 +258,8 @@ KubeletConfig: podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.longclustername.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-nodes_content index fefaaf0a27..1d6ac1b50b 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,12 +1,12 @@ Assets: amd64: - - ff2422571c4c1e9696e367f5f25466b96fb6e501f28aed29f414b1524a52dea0@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubelet - - a5895007f331f08d2e082eb12458764949559f30bcc5beae26c38f3e2724262c@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/amd64/kubectl + - 681c81b7934ae2bf38b9f12d891683972d1fbbf6d7d97e50940a47b139d41b35@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubelet + - 9f74f2fa7ee32ad07e17211725992248470310ca1988214518806b39b1dad9f0@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 29ef1e8635795c2a49a20a56e778f45ff163c5400a5428ca33999ed53d44e3d8@https://github.com/containerd/containerd/releases/download/v1.4.13/cri-containerd-cni-1.4.13-linux-amd64.tar.gz arm64: - - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet - - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl + - 17832b192be5ea314714f7e16efd5e5f65347974bbbf41def6b02f68931380c4@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubelet + - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - debed306ed9a4e70dcbcb228a0b3898f9730099e324f34bb0e76abbaddf7a6a7@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz CAs: @@ -54,6 +54,8 @@ KubeletConfig: node-role.kubernetes.io/node: "" podInfraContainerImage: registry.k8s.io/pause:3.6 podManifestPath: /etc/kubernetes/manifests + shutdownGracePeriod: 30s + shutdownGracePeriodCriticalPods: 10s UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.longclustername.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml b/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml index b91c94fc52..ecbb82c207 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/in-v1alpha2.yaml @@ -21,7 +21,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.nthsqsresources.longclustername.example.com masterPublicName: api.nthsqsresources.longclustername.example.com networkCIDR: 172.20.0.0/16 diff --git a/upup/pkg/fi/cloudup/populate_cluster_spec_test.go b/upup/pkg/fi/cloudup/populate_cluster_spec_test.go index 63ff170c26..8e679e7292 100644 --- a/upup/pkg/fi/cloudup/populate_cluster_spec_test.go +++ b/upup/pkg/fi/cloudup/populate_cluster_spec_test.go @@ -385,10 +385,6 @@ func TestPopulateCluster_DockerVersion(t *testing.T) { KubernetesVersion string DockerVersion string }{ - { - KubernetesVersion: "1.17.0", - DockerVersion: "19.03.15", - }, { KubernetesVersion: "1.21.0", DockerVersion: "20.10.17", diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml index 424c9a18c0..e9302d4fe4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/cluster.yaml @@ -22,7 +22,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml index 764859e2ba..63736355c0 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/cluster.yaml @@ -21,7 +21,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml index be3e35c2f5..9c944a5d4a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.20.1 + image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3 imagePullPolicy: IfNotPresent name: aws-cloud-controller-manager resources: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml index 8992d67bec..a9d68b98de 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/cluster.yaml @@ -26,7 +26,7 @@ spec: cloudControllerManager: cloudProvider: aws iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 37a079ef24..2c4ffe2e93 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.18 manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml - manifestHash: 2102ef7a14aaad0aa67e20831a65462e7ef22e92ef5b33adc265833948c3e573 + manifestHash: 94e504654220a5b5dfe8db461e8566a471dfd8428cf8fdac4509d51d253285cd name: aws-cloud-controller.addons.k8s.io selector: k8s-addon: aws-cloud-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml index 09f951dd28..2a8927a644 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/cluster.yaml @@ -25,7 +25,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml index 7906b92aa5..c04893457e 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/cluster.yaml @@ -29,7 +29,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml index 8380610e66..5fe7b8c2d7 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/cluster.yaml @@ -19,7 +19,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 kubeDNS: provider: CoreDNS tolerations: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml index cece3cf5a7..4272c75bd4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/cluster.yaml @@ -23,7 +23,7 @@ spec: version: 3.1.12 name: events iam: {} - kubernetesVersion: 1.20.0 + kubernetesVersion: 1.22.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com metricsServer: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml index c88f6889c3..afd42ac9cc 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: v1.15.0 manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 065ae832ddac8d0931e9992d6a76f43a33a36975a38003b34f4c5d86a7d42780 + manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io @@ -61,3 +61,10 @@ spec: selector: role.kubernetes.io/networking: "1" version: 9.99.0 + - id: k8s-1.17 + manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml + manifestHash: 7d5c47010ea2aa26cdc658167a360a26c60643e5c096acfa0efdcb26c2c736dc + name: aws-ebs-csi-driver.addons.k8s.io + selector: + k8s-addon: aws-ebs-csi-driver.addons.k8s.io + version: 9.99.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml index 98b2b8d1d8..47fbef5416 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml @@ -25,7 +25,7 @@ spec: version: 3.1.12 name: events iam: {} - kubernetesVersion: 1.20.0 + kubernetesVersion: 1.22.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com metricsServer: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index bc299b57d1..a19a6690fa 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -55,7 +55,7 @@ spec: version: 9.99.0 - id: v1.15.0 manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 065ae832ddac8d0931e9992d6a76f43a33a36975a38003b34f4c5d86a7d42780 + manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io @@ -68,3 +68,10 @@ spec: selector: role.kubernetes.io/networking: "1" version: 9.99.0 + - id: k8s-1.17 + manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml + manifestHash: 7d5c47010ea2aa26cdc658167a360a26c60643e5c096acfa0efdcb26c2c736dc + name: aws-ebs-csi-driver.addons.k8s.io + selector: + k8s-addon: aws-ebs-csi-driver.addons.k8s.io + version: 9.99.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml index 3f34508a9c..f1b64f95d0 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/cluster.yaml @@ -22,7 +22,7 @@ spec: name: events iam: useServiceAccountExternalPermissions: true - kubernetesVersion: v1.20.6 + kubernetesVersion: v1.22.6 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index ac6a21dad3..2681cca552 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -41,8 +41,15 @@ spec: version: 9.99.0 - id: v1.15.0 manifest: storage-aws.addons.k8s.io/v1.15.0.yaml - manifestHash: 065ae832ddac8d0931e9992d6a76f43a33a36975a38003b34f4c5d86a7d42780 + manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200 name: storage-aws.addons.k8s.io selector: k8s-addon: storage-aws.addons.k8s.io version: 9.99.0 + - id: k8s-1.17 + manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml + manifestHash: 0610d7f75a347d0f838e5fb4171832563bafb67e5529df236bae29fc9dccfdd5 + name: aws-ebs-csi-driver.addons.k8s.io + selector: + k8s-addon: aws-ebs-csi-driver.addons.k8s.io + version: 9.99.0 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml index dd343ba01e..72cdd29333 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/cluster.yaml @@ -21,7 +21,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com additionalSans: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml index 4d25d7bad3..693a214d66 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/cluster.yaml @@ -19,7 +19,7 @@ spec: name: master-us-test-1a name: events iam: {} - kubernetesVersion: v1.20.0 + kubernetesVersion: v1.21.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16