From 098b348d6a3c8cd2a97f9aad2b4b1e02bf1b0095 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Thu, 7 Nov 2019 20:15:59 -0500 Subject: [PATCH] stable channel: promote default AMIs from alpha -> stable Promoting the 2019-09-26 AMIs --- channels/stable | 13 ++++++++----- .../create_cluster/minimal/expected-v1alpha1.yaml | 4 ++-- .../create_cluster/minimal/expected-v1alpha2.yaml | 4 ++-- .../shared_vpc/expected-v1alpha1.yaml | 4 ++-- .../shared_vpc/expected-v1alpha2.yaml | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/channels/stable b/channels/stable index 6eea114019..378b5f4bdf 100644 --- a/channels/stable +++ b/channels/stable @@ -23,18 +23,21 @@ spec: providerID: aws kubernetesVersion: ">=1.10.0 <1.11.0" # Stretch is the default for 1.11 (for nvme) - - name: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-08-16 + - name: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-09-26 providerID: aws kubernetesVersion: ">=1.11.0 <1.12.0" - - name: kope.io/k8s-1.12-debian-stretch-amd64-hvm-ebs-2019-08-16 + - name: kope.io/k8s-1.12-debian-stretch-amd64-hvm-ebs-2019-09-26 providerID: aws kubernetesVersion: ">=1.12.0 <1.13.0" - - name: kope.io/k8s-1.13-debian-stretch-amd64-hvm-ebs-2019-08-16 + - name: kope.io/k8s-1.13-debian-stretch-amd64-hvm-ebs-2019-09-26 providerID: aws kubernetesVersion: ">=1.13.0 <1.14.0" - - name: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-08-16 + - name: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-09-26 providerID: aws - kubernetesVersion: ">=1.14.0" + kubernetesVersion: ">=1.14.0 <1.15.0" + - name: kope.io/k8s-1.15-debian-stretch-amd64-hvm-ebs-2019-09-26 + providerID: aws + kubernetesVersion: ">=1.15.0" - providerID: gce name: "cos-cloud/cos-stable-65-10323-99-0" cluster: diff --git a/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml b/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml index 6972c3efc3..2c0469497b 100644 --- a/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/minimal/expected-v1alpha1.yaml @@ -56,7 +56,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: m3.medium maxSize: 1 minSize: 1 @@ -76,7 +76,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes spec: - image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-09-26 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 index e56a96d387..b410c061e5 100644 --- a/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/minimal/expected-v1alpha2.yaml @@ -60,7 +60,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: m3.medium maxSize: 1 minSize: 1 @@ -80,7 +80,7 @@ metadata: kops.k8s.io/cluster: minimal.example.com name: nodes spec: - image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.11-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml index b6e3b7ba96..0e3db73c10 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha1.yaml @@ -57,7 +57,7 @@ metadata: kops.k8s.io/cluster: vpc.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: m3.medium maxSize: 1 minSize: 1 @@ -77,7 +77,7 @@ metadata: kops.k8s.io/cluster: vpc.example.com name: nodes spec: - image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml index 5460d3077b..195c3c7725 100644 --- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml @@ -61,7 +61,7 @@ metadata: kops.k8s.io/cluster: vpc.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: m3.medium maxSize: 1 minSize: 1 @@ -81,7 +81,7 @@ metadata: kops.k8s.io/cluster: vpc.example.com name: nodes spec: - image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-08-16 + image: kope.io/k8s-1.14-debian-stretch-amd64-hvm-ebs-2019-09-26 machineType: t2.medium maxSize: 2 minSize: 2