Merge pull request #6963 from justinsb/image_bump_112

Configure AMIs for 1.12
kubernetes · May 14, 2019 · 7630cc8 · 7630cc8
2 parents 5ad4272 + 3f7da40
commit 7630cc8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/channels/alpha b/channels/alpha
@@ -25,7 +25,10 @@ spec:
     # Stretch is the default for 1.11 (for nvme)
     - name: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2018-08-17
       providerID: aws
-      kubernetesVersion: ">=1.11.0"
+      kubernetesVersion: ">=1.11.0 <1.12.0"
+    - name: kope.io/k8s-1.12-debian-stretch-amd64-hvm-ebs-2019-05-13
+      providerID: aws
+      kubernetesVersion: ">=1.12.0"
     - providerID: gce
       name: "cos-cloud/cos-stable-65-10323-99-0"
   cluster:

diff --git a/channels/stable b/channels/stable
@@ -25,7 +25,10 @@ spec:
     # Stretch is the default for 1.11 (for nvme)
     - name: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2018-08-17
       providerID: aws
-      kubernetesVersion: ">=1.11.0"
+      kubernetesVersion: ">=1.11.0 <1.12.0"
+    - name: kope.io/k8s-1.12-debian-stretch-amd64-hvm-ebs-2019-05-13
+      providerID: aws
+      kubernetesVersion: ">=1.12.0"
     - providerID: gce
       name: "cos-cloud/cos-stable-65-10323-99-0"
   cluster: