Merge pull request #3565 from mikesplain/1.7-update-image

Automatic merge from submit-queue. Cherry Pick of #3264 Cherry Pick of #3264 for 1.7
kubernetes · Oct 9, 2017 · 201bc7b · 201bc7b
2 parents e04c29d + 9fba0eb
commit 201bc7b
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 40 deletions.
diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml
@@ -51,7 +51,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -69,7 +69,7 @@ metadata:
     kops.k8s.io/cluster: complex.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ha/expected-v1alpha1.yaml b/tests/integration/create_cluster/ha/expected-v1alpha1.yaml
@@ -59,7 +59,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -77,7 +77,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1b
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -95,7 +95,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1c
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -113,7 +113,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml
@@ -67,7 +67,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -85,7 +85,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1b
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -103,7 +103,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1c
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -121,7 +121,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml
@@ -65,7 +65,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -83,7 +83,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1b
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -101,7 +101,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1c
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -119,7 +119,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
@@ -73,7 +73,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -91,7 +91,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1b
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -109,7 +109,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1c
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -127,7 +127,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
@@ -71,7 +71,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a-1
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -89,7 +89,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a-2
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -107,7 +107,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1a-3
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -125,7 +125,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1b-1
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -143,7 +143,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: master-us-test-1b-2
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -161,7 +161,7 @@ metadata:
     kops.k8s.io/cluster: ha.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml b/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml
@@ -47,7 +47,7 @@ metadata:
     kops.k8s.io/cluster: minimal.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -65,7 +65,7 @@ metadata:
     kops.k8s.io/cluster: minimal.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml
@@ -51,7 +51,7 @@ metadata:
     kops.k8s.io/cluster: minimal.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -69,7 +69,7 @@ metadata:
     kops.k8s.io/cluster: minimal.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha1.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha1.yaml
@@ -53,7 +53,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: bastions
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.micro
   maxSize: 1
   minSize: 1
@@ -71,7 +71,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -89,7 +89,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
@@ -59,7 +59,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: bastions
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.micro
   maxSize: 1
   minSize: 1
@@ -77,7 +77,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: master-us-test-1a
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -95,7 +95,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: nodes
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/private/expected-v1alpha1.yaml b/tests/integration/create_cluster/private/expected-v1alpha1.yaml
@@ -56,7 +56,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: bastions
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.micro
   maxSize: 1
   minSize: 1
@@ -77,7 +77,7 @@ spec:
   additionalSecurityGroups:
   - sg-exampleid3
   - sg-exampleid4
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -98,7 +98,7 @@ spec:
   additionalSecurityGroups:
   - sg-exampleid
   - sg-exampleid2
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2

diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml
@@ -62,7 +62,7 @@ metadata:
     kops.k8s.io/cluster: private.example.com
   name: bastions
 spec:
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.micro
   maxSize: 1
   minSize: 1
@@ -83,7 +83,7 @@ spec:
   additionalSecurityGroups:
   - sg-exampleid3
   - sg-exampleid4
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -104,7 +104,7 @@ spec:
   additionalSecurityGroups:
   - sg-exampleid
   - sg-exampleid2
-  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
+  image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28
   machineType: t2.medium
   maxSize: 2
   minSize: 2