diff --git a/permalinks/upgrade_k8s.md b/permalinks/upgrade_k8s.md index 9f2f6fd67a..0b92166374 100644 --- a/permalinks/upgrade_k8s.md +++ b/permalinks/upgrade_k8s.md @@ -8,6 +8,7 @@ Kops will drop support for Kubernetes versions as follows: | 1.18 | 1.8 and below | | 1.19 | 1.9 and 1.10 | | 1.20 | 1.11 and 1.12 | +| 1.21 | 1.13 and 1.14 | You are running a version of kubernetes that we recommend upgrading. diff --git a/tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml index a50b5183ef..1b7f36c95a 100644 --- a/tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml @@ -151,7 +151,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -161,13 +163,13 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -190,9 +192,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -216,7 +216,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese clusterCIDR: 100.96.0.0/11 clusterName: launchtemplates.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -225,15 +225,14 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -241,8 +240,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -252,7 +249,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -260,8 +256,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -282,21 +276,20 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -304,8 +297,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -338,6 +329,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -496,7 +490,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -506,13 +502,13 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -535,9 +531,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -561,7 +555,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese clusterCIDR: 100.96.0.0/11 clusterName: launchtemplates.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -570,15 +564,14 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -586,8 +579,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -597,7 +588,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -605,8 +595,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -627,21 +615,20 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -649,8 +636,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -683,6 +668,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -841,7 +829,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -851,13 +841,13 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -880,9 +870,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -906,7 +894,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese clusterCIDR: 100.96.0.0/11 clusterName: launchtemplates.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -915,15 +903,14 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -931,8 +918,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -942,7 +927,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -950,8 +934,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -972,21 +954,20 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -994,8 +975,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -1028,6 +1007,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -1186,7 +1168,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -1196,15 +1180,14 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -1212,8 +1195,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -1233,21 +1214,20 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: nodes InstanceGroupRole: Node KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -1255,8 +1235,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 diff --git a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data index 624d435c45..11738eb28b 100644 --- a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data +++ b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: launchtemplates.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data index 0776d80b83..d1bd07a6db 100644 --- a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data +++ b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: launchtemplates.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data index 78e3bd1cb8..9aaac8df59 100644 --- a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data +++ b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: launchtemplates.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_nodes.launchtemplates.example.com_user_data b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_nodes.launchtemplates.example.com_user_data index efe96d0706..82301ac4b4 100644 --- a/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_nodes.launchtemplates.example.com_user_data +++ b/tests/integration/update_cluster/launch_templates/data/aws_launch_configuration_nodes.launchtemplates.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,15 +162,14 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -176,8 +177,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -197,21 +196,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: launchtemplates.example.com ConfigBase: memfs://clusters.example.com/launchtemplates.example.com InstanceGroupName: nodes InstanceGroupRole: Node KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -219,8 +217,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 diff --git a/tests/integration/update_cluster/launch_templates/in-v1alpha2.yaml b/tests/integration/update_cluster/launch_templates/in-v1alpha2.yaml index d8acaef021..dcbeabe9c6 100644 --- a/tests/integration/update_cluster/launch_templates/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/launch_templates/in-v1alpha2.yaml @@ -29,7 +29,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.12.9 + kubernetesVersion: v1.18.9 masterInternalName: api.internal.launchtemplates.example.com masterPublicName: api.launchtemplates.example.com networkCIDR: 10.0.0.0/16 diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index 78dc43f9f2..00cf7d782e 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -151,7 +151,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -161,13 +163,13 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -190,9 +192,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -216,7 +216,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -225,15 +225,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -241,8 +240,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -252,7 +249,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -260,8 +256,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -282,21 +276,20 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -304,8 +297,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -338,6 +329,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -496,7 +490,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -506,13 +502,13 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -535,9 +531,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -561,7 +555,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -570,15 +564,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -586,8 +579,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -597,7 +588,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -605,8 +595,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -627,21 +615,20 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -649,8 +636,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -683,6 +668,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -841,7 +829,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -851,13 +841,13 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -880,9 +870,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -906,7 +894,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -915,15 +903,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -931,8 +918,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -942,7 +927,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -950,8 +934,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -972,21 +954,20 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -994,8 +975,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -1028,6 +1007,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -1186,7 +1168,9 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -1196,15 +1180,14 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -1212,8 +1195,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -1233,21 +1214,20 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -1255,8 +1235,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index c0784075a2..b6f7e18d90 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index e639376a8a..356ac7bc45 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index ffc0d4e2b8..b8a1bd2d6b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index f94b7fa9b7..7e4d4182c5 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,15 +162,14 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -176,8 +177,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -197,21 +196,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -219,8 +217,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 diff --git a/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml b/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml index 0e73e84d3f..9f06681e26 100644 --- a/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/mixed_instances/in-v1alpha2.yaml @@ -29,7 +29,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.12.9 + kubernetesVersion: v1.18.9 masterInternalName: api.internal.mixedinstances.example.com masterPublicName: api.mixedinstances.example.com networkCIDR: 10.0.0.0/16 diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index 78dc43f9f2..00cf7d782e 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -151,7 +151,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -161,13 +163,13 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -190,9 +192,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -216,7 +216,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -225,15 +225,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -241,8 +240,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -252,7 +249,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -260,8 +256,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -282,21 +276,20 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -304,8 +297,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -338,6 +329,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -496,7 +490,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -506,13 +502,13 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -535,9 +531,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -561,7 +555,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -570,15 +564,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -586,8 +579,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -597,7 +588,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -605,8 +595,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -627,21 +615,20 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -649,8 +636,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -683,6 +668,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -841,7 +829,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -851,13 +841,13 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -880,9 +870,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -906,7 +894,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -915,15 +903,14 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -931,8 +918,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -942,7 +927,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -950,8 +934,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -972,21 +954,20 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -994,8 +975,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -1028,6 +1007,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz + staticManifests: + - key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV @@ -1186,7 +1168,9 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -1196,15 +1180,14 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -1212,8 +1195,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -1233,21 +1214,20 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -1255,8 +1235,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index c0784075a2..b6f7e18d90 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index e639376a8a..356ac7bc45 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index ffc0d4e2b8..b8a1bd2d6b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,13 +162,13 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 encryptionConfig: null etcdClusters: events: - version: 3.2.24 + version: 3.4.3 main: - version: 3.2.24 + version: 3.4.3 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -189,9 +191,7 @@ kubeAPIServer: - http://127.0.0.1:4001 etcdServersOverrides: - /events#http://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.12.9 - insecureBindAddress: 127.0.0.1 - insecurePort: 8080 + image: k8s.gcr.io/kube-apiserver:v1.18.9 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -215,7 +215,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: mixedinstances.example.com configureCloudRoutes: true - image: k8s.gcr.io/kube-controller-manager:v1.12.9 + image: k8s.gcr.io/kube-controller-manager:v1.18.9 leaderElection: leaderElect: true logLevel: 2 @@ -224,15 +224,14 @@ kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.12.9 + image: k8s.gcr.io/kube-scheduler:v1.18.9 leaderElection: leaderElect: true logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -240,8 +239,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -251,7 +248,6 @@ kubelet: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests masterKubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -259,8 +255,6 @@ masterKubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -281,21 +275,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: Master KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -303,8 +296,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -337,6 +328,9 @@ protokubeImage: - https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz - https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-arm64.tar.gz - https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-arm64.tar.gz +staticManifests: +- key: kube-apiserver-healthcheck + path: manifests/static/kube-apiserver-healthcheck.yaml __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index f94b7fa9b7..7e4d4182c5 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -150,7 +150,9 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null containerRuntime: docker containerd: - skipInstall: true + configOverride: | + disabled_plugins = ["cri"] + logLevel: info docker: ipMasq: false ipTables: false @@ -160,15 +162,14 @@ docker: - max-size=10m - max-file=5 storage: overlay2,overlay,aufs - version: 18.06.3 + version: 19.03.13 kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m hostnameOverride: '@aws' - image: k8s.gcr.io/kube-proxy:v1.12.9 + image: k8s.gcr.io/kube-proxy:v1.18.9 logLevel: 2 kubelet: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -176,8 +177,6 @@ kubelet: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 @@ -197,21 +196,20 @@ __EOF_IG_SPEC cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: - - e914b17532c411cb7c0cc472131b61935fb66b31@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubelet - - aa3e93897a6999d6c7dedbc41793c90d41eeb000@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/amd64/kubectl - - 3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz - - 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822@https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz + - 5028b6548e8838e1e0851f10e8bd8d9a6ef1693e3f1dac09f7d50c4c2873f20b@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubelet + - 6a68756a2d3d04b4d0f52b00de6493ba2c1fcb28b32f3e4a0e99b3d9f6c4e8ed@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/amd64/kubectl + - 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz + - ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz arm64: - - 412e243c45c11395395a117802cbf76b7f4ac0ed@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubelet - - 0c262007ae32aeb991fbe906f106c0203140a3f7@https://storage.googleapis.com/kubernetes-release/release/v1.12.9/bin/linux/arm64/kubectl - - 7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-arm64-v0.7.5.tgz - - defb2ccc95c0825833216c8b9e0e15baaa51bcedb3efc1f393f5352d184dead4@https://download.docker.com/linux/static/stable/aarch64/docker-18.06.3-ce.tgz + - 21b0fb4682deea19be3ac160403db9858dc9d02b101d60eb6fc22a86523ec434@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubelet + - 9f466ff8d40097914a1ded0288ef8b9eb6f4ad39a9990cb2c0f8d1a710013a4f@https://storage.googleapis.com/kubernetes-release/release/v1.18.9/bin/linux/arm64/kubectl + - 43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.6/cni-plugins-linux-arm64-v0.8.6.tgz + - bdf080af7d6f383ad80e415e9c1952a63c7038c149dc673b7598bfca4d3311ec@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes InstanceGroupRole: Node KubeletConfig: - allowPrivileged: true anonymousAuth: false cgroupRoot: / cloudProvider: aws @@ -219,8 +217,6 @@ KubeletConfig: clusterDomain: cluster.local enableDebuggingHandlers: true evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - ExperimentalCriticalPodAnnotation: "true" hostnameOverride: '@aws' kubeconfigPath: /var/lib/kubelet/kubeconfig logLevel: 2 diff --git a/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml b/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml index 24378afa96..322b94f156 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/in-v1alpha2.yaml @@ -29,7 +29,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.12.9 + kubernetesVersion: v1.18.9 masterInternalName: api.internal.mixedinstances.example.com masterPublicName: api.mixedinstances.example.com networkCIDR: 10.0.0.0/16 diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index b316d979b0..88371a2891 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -79,9 +79,9 @@ var ( // AlphaAllowALI is a feature flag that gates aliyun support while it is alpha AlphaAllowALI = featureflag.New("AlphaAllowALI", featureflag.Bool(false)) // OldestSupportedKubernetesVersion is the oldest kubernetes version that is supported in Kops - OldestSupportedKubernetesVersion = "1.11.0" + OldestSupportedKubernetesVersion = "1.13.0" // OldestRecommendedKubernetesVersion is the oldest kubernetes version that is not deprecated in Kops - OldestRecommendedKubernetesVersion = "1.13.0" + OldestRecommendedKubernetesVersion = "1.15.0" ) type ApplyClusterCmd struct {