From 930fe8e7407d68b68f2c597b05458b327d96abad Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 22 Jan 2018 19:23:49 -0500 Subject: [PATCH] Promote alpha channel image to stable The 4.4.111 image is not showing the flakiness on the NFS e2e tests. --- channels/stable | 12 ++++++------ .../create_cluster/complex/expected-v1alpha2.yaml | 4 ++-- .../create_cluster/ha/expected-v1alpha1.yaml | 8 ++++---- .../create_cluster/ha/expected-v1alpha2.yaml | 8 ++++---- .../create_cluster/ha_encrypt/expected-v1alpha1.yaml | 8 ++++---- .../create_cluster/ha_encrypt/expected-v1alpha2.yaml | 8 ++++---- .../create_cluster/overrides/expected-v1alpha2.yaml | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/channels/stable b/channels/stable index 7f60095677..73f7201672 100644 --- a/channels/stable +++ b/channels/stable @@ -4,24 +4,24 @@ spec: - name: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28 providerID: aws kubernetesVersion: ">=1.4.0 <1.5.0" - - name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05 + - name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 providerID: aws kubernetesVersion: ">=1.5.0 <1.6.0" - - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2018-01-05 + - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2018-01-14 providerID: aws kubernetesVersion: ">=1.6.0 <1.7.0" - - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05 + - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 providerID: aws kubernetesVersion: ">=1.7.0 <1.8.0" - - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-05 + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-14 providerID: aws kubernetesVersion: ">=1.8.0 <1.9.0" - - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-05 + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-14 providerID: aws kubernetesVersion: ">=1.9.0 <1.10.0" # Need stretch as default in 1.10 (for nvme) # BUT... this is causing the submit queue to block, so back to jessie temporarily: https://github.com/kubernetes/kubernetes/issues/56763 - - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-05 + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-14 providerID: aws kubernetesVersion: ">=1.10.0" - providerID: gce diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index 6f6a443f46..5bfadf989a 100644 --- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml @@ -54,7 +54,7 @@ metadata: kops.k8s.io/cluster: complex.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -74,7 +74,7 @@ metadata: kops.k8s.io/cluster: complex.example.com name: nodes spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 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 index 23a0b6b3aa..34e7ba3eda 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha1.yaml @@ -62,7 +62,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -82,7 +82,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -102,7 +102,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -122,7 +122,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 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 index 2d389477a4..2eac22349e 100644 --- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml @@ -70,7 +70,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -90,7 +90,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -110,7 +110,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -130,7 +130,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 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 index be80c1776a..495a279240 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml @@ -68,7 +68,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -88,7 +88,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -108,7 +108,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -128,7 +128,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 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 index e1f3df4069..d31b3cf13e 100644 --- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml @@ -76,7 +76,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -96,7 +96,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -116,7 +116,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-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -136,7 +136,7 @@ metadata: kops.k8s.io/cluster: ha.example.com name: nodes spec: - image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: t2.medium maxSize: 2 minSize: 2 diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml index 0bdd2fba49..9096c5cd1e 100644 --- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml +++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml @@ -57,7 +57,7 @@ metadata: kops.k8s.io/cluster: overrides.example.com name: master-us-test-1a spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: m3.medium maxSize: 1 minSize: 1 @@ -77,7 +77,7 @@ metadata: kops.k8s.io/cluster: overrides.example.com name: nodes spec: - image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-14 machineType: t2.medium maxSize: 2 minSize: 2