Update kubernetes version for tests

kubernetes · Oct 10, 2019 · 1905653 · 1905653
1 parent ae1c0c2
commit 1905653
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 43 deletions.
diff --git a/tests/integration/update_cluster/nosshkey-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nosshkey-cloudformation/cloudformation.json.extracted.yaml
@@ -141,37 +141,61 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersnosshkeyexamplec
   docker:
     ipMasq: false
     ipTables: false
+    logDriver: json-file
     logLevel: warn
-    storage: overlay,aufs
-    version: 1.11.2
+    logOpt:
+    - max-size=10m
+    - max-file=5
+    storage: overlay2,overlay,aufs
+    version: 17.03.2
   encryptionConfig: null
   etcdClusters:
     events:
-      image: gcr.io/google_containers/etcd:2.2.1
+      image: k8s.gcr.io/etcd:2.2.1
       version: 2.2.1
     main:
-      image: gcr.io/google_containers/etcd:2.2.1
+      image: k8s.gcr.io/etcd:2.2.1
       version: 2.2.1
   kubeAPIServer:
-    address: 127.0.0.1
-    admissionControl:
+    allowPrivileged: true
+    anonymousAuth: false
+    apiServerCount: 1
+    authorizationMode: AlwaysAllow
+    bindAddress: 0.0.0.0
+    cloudProvider: aws
+    enableAdmissionPlugins:
+    - Initializers
     - NamespaceLifecycle
     - LimitRanger
     - ServiceAccount
     - PersistentVolumeLabel
     - DefaultStorageClass
+    - DefaultTolerationSeconds
+    - MutatingAdmissionWebhook
+    - ValidatingAdmissionWebhook
+    - NodeRestriction
     - ResourceQuota
-    allowPrivileged: true
-    apiServerCount: 1
-    authorizationMode: AlwaysAllow
-    cloudProvider: aws
+    etcdQuorumRead: false
     etcdServers:
     - http://127.0.0.1:4001
     etcdServersOverrides:
     - /events#http://127.0.0.1:4002
-    image: gcr.io/google_containers/kube-apiserver:v1.4.12
+    image: k8s.gcr.io/kube-apiserver:v1.11.10
+    insecureBindAddress: 127.0.0.1
     insecurePort: 8080
+    kubeletPreferredAddressTypes:
+    - InternalIP
+    - Hostname
+    - ExternalIP
     logLevel: 2
+    requestheaderAllowedNames:
+    - aggregator
+    requestheaderExtraHeaderPrefixes:
+    - X-Remote-Extra-
+    requestheaderGroupHeaders:
+    - X-Remote-Group
+    requestheaderUsernameHeaders:
+    - X-Remote-User
     securePort: 443
     serviceClusterIPRange: 100.64.0.0/13
     storageBackend: etcd2
@@ -182,60 +206,58 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersnosshkeyexamplec
     clusterCIDR: 100.96.0.0/11
     clusterName: nosshkey.example.com
     configureCloudRoutes: true
-    image: gcr.io/google_containers/kube-controller-manager:v1.4.12
+    image: k8s.gcr.io/kube-controller-manager:v1.11.10
     leaderElection:
       leaderElect: true
     logLevel: 2
-    master: 127.0.0.1:8080
+    useServiceAccountCredentials: true
   kubeProxy:
     clusterCIDR: 100.96.0.0/11
     cpuRequest: 100m
     hostnameOverride: '@aws'
-    image: gcr.io/google_containers/kube-proxy:v1.4.12
+    image: k8s.gcr.io/kube-proxy:v1.11.10
     logLevel: 2
   kubeScheduler:
-    image: gcr.io/google_containers/kube-scheduler:v1.4.12
+    image: k8s.gcr.io/kube-scheduler:v1.11.10
     leaderElection:
       leaderElect: true
     logLevel: 2
-    master: http://127.0.0.1:8080
   kubelet:
     allowPrivileged: true
-    apiServers: https://api.internal.nosshkey.example.com
-    babysitDaemons: true
-    cgroupRoot: docker
+    cgroupRoot: /
     cloudProvider: aws
     clusterDNS: 100.64.0.10
     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
     networkPluginMTU: 9001
     networkPluginName: kubenet
     nonMasqueradeCIDR: 100.64.0.0/10
-    podInfraContainerImage: gcr.io/google_containers/pause-amd64:3.0
+    podInfraContainerImage: k8s.gcr.io/pause-amd64:3.0
     podManifestPath: /etc/kubernetes/manifests
-    reconcileCIDR: true
   masterKubelet:
     allowPrivileged: true
-    apiServers: http://127.0.0.1:8080
-    babysitDaemons: true
-    cgroupRoot: docker
+    cgroupRoot: /
     cloudProvider: aws
     clusterDNS: 100.64.0.10
     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
     networkPluginMTU: 9001
     networkPluginName: kubenet
     nonMasqueradeCIDR: 100.64.0.0/10
-    podCIDR: 10.123.45.0/28
-    podInfraContainerImage: gcr.io/google_containers/pause-amd64:3.0
+    podInfraContainerImage: k8s.gcr.io/pause-amd64:3.0
     podManifestPath: /etc/kubernetes/manifests
-    reconcileCIDR: true
     registerSchedulable: false
 
   __EOF_CLUSTER_SPEC
@@ -249,9 +271,9 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersnosshkeyexamplec
 
   cat > kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
-  - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet
-  - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl
-  - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
+  - a1e5d2a7da4cabc29af0dda630564511a9b437d8@https://storage.googleapis.com/kubernetes-release/release/v1.11.10/bin/linux/amd64/kubelet
+  - c133f55152c76c33d9b41894dcd311064904503e@https://storage.googleapis.com/kubernetes-release/release/v1.11.10/bin/linux/amd64/kubectl
+  - 52e9d2de8a5f927307d9397308735658ee44ab8d@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz
   - 42b15a0a0a56531750bde3c7b08d0cf27c170c48@https://github.com/kubernetes/kops/releases/download/1.8.1/linux-amd64-utils.tar.gz,https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/utils.tar.gz
   ClusterName: nosshkey.example.com
   ConfigBase: memfs://clusters.example.com/nosshkey.example.com
@@ -415,33 +437,37 @@ Resources.AWSAutoScalingLaunchConfigurationnodesnosshkeyexamplecom.Properties.Us
   docker:
     ipMasq: false
     ipTables: false
+    logDriver: json-file
     logLevel: warn
-    storage: overlay,aufs
-    version: 1.11.2
+    logOpt:
+    - max-size=10m
+    - max-file=5
+    storage: overlay2,overlay,aufs
+    version: 17.03.2
   kubeProxy:
     clusterCIDR: 100.96.0.0/11
     cpuRequest: 100m
     hostnameOverride: '@aws'
-    image: gcr.io/google_containers/kube-proxy:v1.4.12
+    image: k8s.gcr.io/kube-proxy:v1.11.10
     logLevel: 2
   kubelet:
     allowPrivileged: true
-    apiServers: https://api.internal.nosshkey.example.com
-    babysitDaemons: true
-    cgroupRoot: docker
+    cgroupRoot: /
     cloudProvider: aws
     clusterDNS: 100.64.0.10
     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
     networkPluginMTU: 9001
     networkPluginName: kubenet
     nonMasqueradeCIDR: 100.64.0.0/10
-    podInfraContainerImage: gcr.io/google_containers/pause-amd64:3.0
+    podInfraContainerImage: k8s.gcr.io/pause-amd64:3.0
     podManifestPath: /etc/kubernetes/manifests
-    reconcileCIDR: true
 
   __EOF_CLUSTER_SPEC
 
@@ -454,9 +480,9 @@ Resources.AWSAutoScalingLaunchConfigurationnodesnosshkeyexamplecom.Properties.Us
 
   cat > kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
-  - c4871c7315817ee114f5c554a58da8ebc54f08c3@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubelet
-  - d9fdb6b37597d371ef853cde76170f38a553aa78@https://storage.googleapis.com/kubernetes-release/release/v1.4.12/bin/linux/amd64/kubectl
-  - 19d49f7b2b99cd2493d5ae0ace896c64e289ccbb@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
+  - a1e5d2a7da4cabc29af0dda630564511a9b437d8@https://storage.googleapis.com/kubernetes-release/release/v1.11.10/bin/linux/amd64/kubelet
+  - c133f55152c76c33d9b41894dcd311064904503e@https://storage.googleapis.com/kubernetes-release/release/v1.11.10/bin/linux/amd64/kubectl
+  - 52e9d2de8a5f927307d9397308735658ee44ab8d@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz
   - 42b15a0a0a56531750bde3c7b08d0cf27c170c48@https://github.com/kubernetes/kops/releases/download/1.8.1/linux-amd64-utils.tar.gz,https://kubeupv2.s3.amazonaws.com/kops/1.8.1/linux/amd64/utils.tar.gz
   ClusterName: nosshkey.example.com
   ConfigBase: memfs://clusters.example.com/nosshkey.example.com

diff --git a/tests/integration/update_cluster/nosshkey-cloudformation/in-v1alpha2.yaml b/tests/integration/update_cluster/nosshkey-cloudformation/in-v1alpha2.yaml
@@ -18,7 +18,7 @@ spec:
     - instanceGroup: master-us-test-1a
       name: us-test-1a
     name: events
-  kubernetesVersion: v1.4.12
+  kubernetesVersion: v1.11.10
   masterInternalName: api.internal.nosshkey.example.com
   masterPublicName: api.nosshkey.example.com
   networkCIDR: 172.20.0.0/16

diff --git a/tests/integration/update_cluster/nosshkey/in-v1alpha2.yaml b/tests/integration/update_cluster/nosshkey/in-v1alpha2.yaml
@@ -29,7 +29,7 @@ spec:
     name: events
   kubeAPIServer:
     serviceNodePortRange: 28000-32767
-  kubernetesVersion: v1.4.12
+  kubernetesVersion: v1.11.10
   masterInternalName: api.internal.nosshkey.example.com
   masterPublicName: api.nosshkey.example.com
   networkCIDR: 172.20.0.0/16