From 22687c48c2bc766b64a04ff374091c9340e0746c Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sat, 17 Sep 2022 20:08:37 +0200 Subject: [PATCH] Bump tests to supported k8s version --- nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml | 2 +- nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml | 2 +- .../tests/containerdbuilder/from_docker_19.03.11/cluster.yaml | 2 +- .../tests/containerdbuilder/from_docker_19.03.14/cluster.yaml | 2 +- nodeup/pkg/model/tests/containerdbuilder/simple/cluster.yaml | 2 +- nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml | 2 +- .../pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml | 2 +- .../pkg/model/tests/dockerbuilder/docker_19.03.11/cluster.yaml | 2 +- .../pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml | 2 +- nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml | 2 +- nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml | 2 +- nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml | 2 +- nodeup/pkg/model/tests/golden/awsiam/cluster.yaml | 2 +- nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml | 3 +-- nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml | 2 +- .../tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml | 3 +-- nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml | 2 +- .../tests/golden/without-etcd-events/tasks-kube-apiserver.yaml | 3 +-- nodeup/pkg/model/tests/protokube/cluster.yaml | 2 +- .../model/tests/updateservicebuilder/automatic/cluster.yaml | 2 +- .../pkg/model/tests/updateservicebuilder/external/cluster.yaml | 2 +- pkg/model/components/etcdmanager/tests/interval/cluster.yaml | 2 +- pkg/model/components/etcdmanager/tests/minimal/cluster.yaml | 2 +- .../etcdmanager/tests/overwrite_settings/cluster.yaml | 2 +- pkg/model/components/etcdmanager/tests/proxy/cluster.yaml | 2 +- pkg/model/components/kubeapiserver/tests/minimal/cluster.yaml | 2 +- tests/integration/conversion/aws/v1alpha2.yaml | 2 +- tests/integration/conversion/aws/v1alpha3.yaml | 2 +- tests/integration/conversion/azure/v1alpha2.yaml | 2 +- tests/integration/conversion/azure/v1alpha3.yaml | 2 +- tests/integration/conversion/canal/v1alpha2.yaml | 2 +- tests/integration/conversion/canal/v1alpha3.yaml | 2 +- tests/integration/conversion/cilium/v1alpha2.yaml | 2 +- tests/integration/conversion/cilium/v1alpha3.yaml | 2 +- tests/integration/conversion/do/v1alpha2.yaml | 2 +- tests/integration/conversion/do/v1alpha3.yaml | 2 +- tests/integration/conversion/gce/v1alpha2.yaml | 2 +- tests/integration/conversion/gce/v1alpha3.yaml | 2 +- tests/integration/conversion/minimal/legacy-v1alpha2.yaml | 2 +- tests/integration/conversion/minimal/v1alpha2.yaml | 2 +- tests/integration/conversion/minimal/v1alpha3.yaml | 2 +- tests/integration/conversion/openstack/v1alpha2.yaml | 2 +- tests/integration/conversion/openstack/v1alpha3.yaml | 2 +- .../metrics-server/insecure-1.19/cluster.yaml | 2 +- .../metrics-server/secure-1.19/cluster.yaml | 2 +- 45 files changed, 45 insertions(+), 48 deletions(-) diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/cluster.yaml index f535c7bc22..5687bd6b00 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.19.0 + kubernetesVersion: v1.20.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/flatcar/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml index eef71d0b3f..a8530ec10c 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml @@ -39,7 +39,7 @@ contents: | runtime_type = "io.containerd.runc.v2" [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = false + SystemdCgroup = true path: /etc/containerd/config-kops.toml type: file --- 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 3ade32e0fa..d981105d52 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.19.0 + kubernetesVersion: v1.20.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 10426810a8..b5cde1e4e5 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.19.0 + kubernetesVersion: v1.20.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 f535c7bc22..5687bd6b00 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.19.0 + kubernetesVersion: v1.20.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/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml index f3b79ce23f..d0b5084a91 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml @@ -39,7 +39,7 @@ contents: | runtime_type = "io.containerd.runc.v2" [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = false + SystemdCgroup = true path: /etc/containerd/config-kops.toml type: file --- diff --git a/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/containerdbuilder/skipinstall/cluster.yaml index 4ba2b488f9..f13849605a 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.16.3 + kubernetesVersion: v1.20.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 fc9bc5cb5d..6c58e92e6d 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.19.0 + kubernetesVersion: v1.20.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/docker_19.03.11/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml index 1ec020baa2..6c4a296ba6 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/docker_19.03.11/tasks.yaml @@ -1,5 +1,5 @@ contents: |- - DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs + DOCKER_OPTS=--exec-opt=native.cgroupdriver=systemd --ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml index 98829f831e..3e99c1dcb7 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.18.0 + kubernetesVersion: v1.20.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/logflags/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml index 1ec020baa2..6c4a296ba6 100644 --- a/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml +++ b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml @@ -1,5 +1,5 @@ contents: |- - DOCKER_OPTS=--ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs + DOCKER_OPTS=--exec-opt=native.cgroupdriver=systemd --ip-masq=false --iptables=false --log-driver=json-file --log-level=info --log-opt=max-file=5 --log-opt=max-size=10m --storage-driver=overlay2,overlay,aufs DOCKER_NOFILE=1000000 path: /etc/sysconfig/docker type: file diff --git a/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/skipinstall/cluster.yaml index c47efc6810..6d73b3896c 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.14.6 + kubernetesVersion: v1.20.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 1548846853..f9eec58424 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.18.0 + kubernetesVersion: v1.20.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 f3f3088d9b..16939fc2ee 100644 --- a/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml @@ -51,7 +51,6 @@ contents: | - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key - --etcd-servers-overrides=/events#https://127.0.0.1:4002 - --etcd-servers=https://127.0.0.1:4001 - - --insecure-port=0 - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP @@ -77,7 +76,7 @@ contents: | - --log-file=/var/log/kube-apiserver.log command: - /usr/local/bin/kube-apiserver - image: registry.k8s.io/kube-apiserver:v1.18.0 + image: registry.k8s.io/kube-apiserver:v1.20.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 883c52a476..6a9942343f 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.18.0 + kubernetesVersion: v1.20.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 820535c2ed..20ab58699a 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 @@ -29,7 +29,6 @@ contents: | - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key - --etcd-servers-overrides=/events#https://events.etcd.minimal.example.com:4002 - --etcd-servers=https://main.etcd.minimal.example.com:4001 - - --insecure-port=0 - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP @@ -55,7 +54,7 @@ contents: | - --log-file=/var/log/kube-apiserver.log command: - /usr/local/bin/kube-apiserver - image: registry.k8s.io/kube-apiserver:v1.18.0 + image: registry.k8s.io/kube-apiserver:v1.20.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 f2f2d84e98..7e8d786a4d 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.18.0 + kubernetesVersion: v1.20.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 8d7a335cbb..8d118a55e0 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 @@ -28,7 +28,6 @@ contents: | - --etcd-certfile=/srv/kubernetes/kube-apiserver/etcd-client.crt - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key - --etcd-servers=https://127.0.0.1:4001 - - --insecure-port=0 - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP @@ -54,7 +53,7 @@ contents: | - --log-file=/var/log/kube-apiserver.log command: - /usr/local/bin/kube-apiserver - image: registry.k8s.io/kube-apiserver:v1.18.0 + image: registry.k8s.io/kube-apiserver:v1.20.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 1507c32e42..d201250e22 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.18.0 + kubernetesVersion: v1.20.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 644196b987..d201250e22 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.17.0 + kubernetesVersion: v1.20.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 a3cd870c33..e0f49f031a 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.17.0 + kubernetesVersion: v1.20.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/interval/cluster.yaml b/pkg/model/components/etcdmanager/tests/interval/cluster.yaml index ffc0b5ca6a..5bfc358662 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.17.0 + kubernetesVersion: v1.20.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 78ce9019c7..fa7e57e97a 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.17.0 + kubernetesVersion: v1.20.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 c635ae9ebe..85a6b48e67 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.17.0 + kubernetesVersion: v1.20.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 80b8bdb047..43ff7ead6a 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.17.0 + kubernetesVersion: v1.20.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 8a5e105f4c..0731c9a8fb 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.18.0 + kubernetesVersion: v1.20.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/v1alpha2.yaml b/tests/integration/conversion/aws/v1alpha2.yaml index b5d8f8e27b..da9f9033e1 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.14.0 + kubernetesVersion: v1.20.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 347251f803..4d4ab76cee 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.14.0 + kubernetesVersion: v1.20.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 8e0e1e000c..859d41d5df 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.14.0 + kubernetesVersion: v1.20.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 45ae2250a7..eb33b151ed 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.14.0 + kubernetesVersion: v1.20.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 33dd1f0783..4b9bc7ec31 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.14.0 + kubernetesVersion: v1.20.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 936c327d1e..2fdf109d62 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.14.0 + kubernetesVersion: v1.20.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 255ac9415a..8098858872 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.14.0 + kubernetesVersion: v1.20.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 182ce1a092..d4ab4a81e1 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.14.0 + kubernetesVersion: v1.20.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 819ea3daad..03211dac4b 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.14.0 + kubernetesVersion: v1.20.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 9f0621682d..9b13bedbda 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.14.0 + kubernetesVersion: v1.20.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 6549b47751..ca9b9069e6 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.14.0 + kubernetesVersion: v1.20.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 a969a4f95b..e5c0bbdf7f 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.14.0 + kubernetesVersion: v1.20.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 69ee38790f..279781f3ac 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.14.0 + kubernetesVersion: v1.20.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 42cc0dc2bd..78efc635d9 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.14.0 + kubernetesVersion: v1.20.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 f837be02ed..a6c547003a 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.14.0 + kubernetesVersion: v1.20.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 a8e9aa02e1..cf2528d8e5 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.14.0 + kubernetesVersion: v1.20.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 06eba98238..5c1bb952a6 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.14.0 + kubernetesVersion: v1.20.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 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 889cad5e00..cece3cf5a7 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.19.0 + kubernetesVersion: 1.20.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/cluster.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/cluster.yaml index 95f2af56c7..98b2b8d1d8 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.19.0 + kubernetesVersion: 1.20.0 masterInternalName: api.internal.minimal.example.com masterPublicName: api.minimal.example.com metricsServer: