kubernetes · k8s-github-robot · Oct 3, 2017 · Sep 29, 2017 · Sep 29, 2017 · Sep 29, 2017
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
@@ -71,9 +71,7 @@ func TestComplex(t *testing.T) {
 
 // TestMinimalCloudformation runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a
 func TestMinimalCloudformation(t *testing.T) {
-	//runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal", "v1alpha0", false)
-	//runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal", "v1alpha1", false)
-	runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal", "v1alpha2", false)
+	runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal-cloudformation", "v1alpha2", false)
 }
 
 // TestMinimal_141 runs the test on a configuration from 1.4.1 release

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

diff --git a/tests/integration/conversion/minimal/v1alpha0.yaml b/tests/integration/conversion/minimal/v1alpha0.yaml
@@ -17,7 +17,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.minimal.example.com
   masterPublicName: api.minimal.example.com
   networkCIDR: 172.20.0.0/16

diff --git a/tests/integration/conversion/minimal/v1alpha1.yaml b/tests/integration/conversion/minimal/v1alpha1.yaml
@@ -24,7 +24,7 @@ spec:
     name: events
   iam:
     legacy: true
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.minimal.example.com
   masterPublicName: api.minimal.example.com
   networkCIDR: 172.20.0.0/16

diff --git a/tests/integration/conversion/minimal/v1alpha2.yaml b/tests/integration/conversion/minimal/v1alpha2.yaml
@@ -24,7 +24,7 @@ spec:
     legacy: true
   kubernetesApiAccess:
   - 0.0.0.0/0
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.minimal.example.com
   masterPublicName: api.minimal.example.com
   networkCIDR: 172.20.0.0/16

diff --git a/tests/integration/ha/in-v1alpha1.yaml b/tests/integration/ha/in-v1alpha1.yaml
@@ -28,7 +28,7 @@ spec:
     - name: c
       zone: us-test-1c
     name: events
-  kubernetesVersion: v1.4.8
+  kubernetesVersion: v1.4.12
   masterPublicName: api.ha.example.com
   networkCIDR: 172.20.0.0/16
   networking:

diff --git a/tests/integration/ha/in-v1alpha2.yaml b/tests/integration/ha/in-v1alpha2.yaml
@@ -28,7 +28,7 @@ spec:
     name: events
   kubernetesApiAccess:
   - 0.0.0.0/0
-  kubernetesVersion: v1.4.8
+  kubernetesVersion: v1.4.12
   masterPublicName: api.ha.example.com
   networkCIDR: 172.20.0.0/16
   networking:

diff --git a/tests/integration/minimal-141/in-v1alpha0.yaml b/tests/integration/minimal-141/in-v1alpha0.yaml
@@ -17,7 +17,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterPublicName: api.minimal-141.example.com
   networkCIDR: 172.20.0.0/16
   networking:

diff --git a/...s/integration/minimal/cloudformation.json → ...inimal-cloudformation/cloudformation.json b/...s/integration/minimal/cloudformation.json → ...inimal-cloudformation/cloudformation.json
diff --git a/...inimal/cloudformation.json.extracted.yaml → ...mation/cloudformation.json.extracted.yaml b/...inimal/cloudformation.json.extracted.yaml → ...mation/cloudformation.json.extracted.yaml
@@ -164,19 +164,20 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
     - http://127.0.0.1:4001
     etcdServersOverrides:
     - /events#http://127.0.0.1:4002
-    image: gcr.io/google_containers/kube-apiserver:v1.4.6
+    image: gcr.io/google_containers/kube-apiserver:v1.4.12
     insecurePort: 8080
     logLevel: 2
     securePort: 443
     serviceClusterIPRange: 100.64.0.0/13
     storageBackend: etcd2
   kubeControllerManager:
     allocateNodeCIDRs: true
+    attachDetachReconcileSyncPeriod: 1m0s
     cloudProvider: aws
     clusterCIDR: 100.96.0.0/11
     clusterName: minimal.example.com
     configureCloudRoutes: true
-    image: gcr.io/google_containers/kube-controller-manager:v1.4.6
+    image: gcr.io/google_containers/kube-controller-manager:v1.4.12
     leaderElection:
       leaderElect: true
     logLevel: 2
@@ -186,10 +187,10 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
     cpuRequest: 100m
     featureGates: null
     hostnameOverride: '@aws'
-    image: gcr.io/google_containers/kube-proxy:v1.4.6
+    image: gcr.io/google_containers/kube-proxy:v1.4.12
     logLevel: 2
   kubeScheduler:
-    image: gcr.io/google_containers/kube-scheduler:v1.4.6
+    image: gcr.io/google_containers/kube-scheduler:v1.4.12
     leaderElection:
       leaderElect: true
     logLevel: 2
@@ -244,8 +245,8 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco
 
   cat > kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
-  - 7d70e090951486cae52d9a82b7aaf5056f84f8ed@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubelet
-  - 9adcd120fdb7ad6e64c061e56a05fefc12e9618b@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubectl
+  - 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
   - cbba856746a441c7d1a9e95e141c982a1b8864e6@https://kubeupv2.s3.amazonaws.com/kops/1.5.0/linux/amd64/utils.tar.gz
   ClusterName: minimal.example.com
@@ -420,7 +421,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use
     cpuRequest: 100m
     featureGates: null
     hostnameOverride: '@aws'
-    image: gcr.io/google_containers/kube-proxy:v1.4.6
+    image: gcr.io/google_containers/kube-proxy:v1.4.12
     logLevel: 2
   kubelet:
     allowPrivileged: true
@@ -452,8 +453,8 @@ Resources.AWSAutoScalingLaunchConfigurationnodesminimalexamplecom.Properties.Use
 
   cat > kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
-  - 7d70e090951486cae52d9a82b7aaf5056f84f8ed@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubelet
-  - 9adcd120fdb7ad6e64c061e56a05fefc12e9618b@https://storage.googleapis.com/kubernetes-release/release/v1.4.6/bin/linux/amd64/kubectl
+  - 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
   - cbba856746a441c7d1a9e95e141c982a1b8864e6@https://kubeupv2.s3.amazonaws.com/kops/1.5.0/linux/amd64/utils.tar.gz
   ClusterName: minimal.example.com

diff --git a/tests/integration/minimal-cloudformation/id_rsa.pub b/tests/integration/minimal-cloudformation/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ==
diff --git a/tests/integration/minimal-cloudformation/in-v1alpha2.yaml b/tests/integration/minimal-cloudformation/in-v1alpha2.yaml
@@ -0,0 +1,77 @@
+apiVersion: kops/v1alpha2
+kind: Cluster
+metadata:
+  creationTimestamp: "2016-12-10T22:42:27Z"
+  name: minimal.example.com
+spec:
+  kubernetesApiAccess:
+  - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/minimal.example.com
+  etcdClusters:
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
+    name: main
+  - etcdMembers:
+    - instanceGroup: master-us-test-1a
+      name: us-test-1a
+    name: events
+  kubernetesVersion: v1.4.12
+  masterInternalName: api.internal.minimal.example.com
+  masterPublicName: api.minimal.example.com
+  networkCIDR: 172.20.0.0/16
+  networking:
+    kubenet: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+    - 0.0.0.0/0
+  topology:
+    masters: public
+    nodes: public
+  subnets:
+  - cidr: 172.20.32.0/19
+    name: us-test-1a
+    type: Public
+    zone: us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-10T22:42:28Z"
+  name: nodes
+  labels:
+    kops.k8s.io/cluster: minimal.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: t2.medium
+  maxSize: 2
+  minSize: 2
+  role: Node
+  subnets:
+  - us-test-1a
+
+---
+
+apiVersion: kops/v1alpha2
+kind: InstanceGroup
+metadata:
+  creationTimestamp: "2016-12-10T22:42:28Z"
+  name: master-us-test-1a
+  labels:
+    kops.k8s.io/cluster: minimal.example.com
+spec:
+  associatePublicIp: true
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
+  machineType: m3.medium
+  maxSize: 1
+  minSize: 1
+  role: Master
+  subnets:
+  - us-test-1a
+
+
diff --git a/tests/integration/minimal/in-v1alpha0.yaml b/tests/integration/minimal/in-v1alpha0.yaml
@@ -17,7 +17,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.minimal.example.com
   masterPublicName: api.minimal.example.com
   networkCIDR: 172.20.0.0/16

diff --git a/tests/integration/minimal/in-v1alpha1.yaml b/tests/integration/minimal/in-v1alpha1.yaml
@@ -18,7 +18,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.minimal.example.com
   masterPublicName: api.minimal.example.com
   networkCIDR: 172.20.0.0/16

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

diff --git a/tests/integration/privatecalico/in-v1alpha1.yaml b/tests/integration/privatecalico/in-v1alpha1.yaml
@@ -18,7 +18,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.privatecalico.example.com
   masterPublicName: api.privatecalico.example.com
   networkCIDR: 172.20.0.0/16

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

diff --git a/tests/integration/privatecanal/in-v1alpha1.yaml b/tests/integration/privatecanal/in-v1alpha1.yaml
@@ -18,7 +18,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.privatecanal.example.com
   masterPublicName: api.privatecanal.example.com
   networkCIDR: 172.20.0.0/16

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

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

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

diff --git a/tests/integration/privateflannel/in-v1alpha1.yaml b/tests/integration/privateflannel/in-v1alpha1.yaml
@@ -18,7 +18,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.privateflannel.example.com
   masterPublicName: api.privateflannel.example.com
   networkCIDR: 172.20.0.0/16

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

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

diff --git a/tests/integration/privateweave/in-v1alpha1.yaml b/tests/integration/privateweave/in-v1alpha1.yaml
@@ -18,7 +18,7 @@ spec:
     - name: us-test-1a
       zone: us-test-1a
     name: events
-  kubernetesVersion: v1.4.6
+  kubernetesVersion: v1.4.12
   masterInternalName: api.internal.privateweave.example.com
   masterPublicName: api.privateweave.example.com
   networkCIDR: 172.20.0.0/16

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

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

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