diff --git a/channels/alpha b/channels/alpha index db132e33eeaa3..26c11a9b8e36e 100644 --- a/channels/alpha +++ b/channels/alpha @@ -48,7 +48,7 @@ spec: requiredVersion: 1.4.2 kopsVersions: - range: ">=1.8.0-alpha.1" - recommendedVersion: 1.8.0-beta.2 + recommendedVersion: 1.8.0 #requiredVersion: 1.8.0 kubernetesVersion: 1.8.4 - range: ">=1.7.0-alpha.1" diff --git a/channels/stable b/channels/stable index 044d5bb27ea45..26c11a9b8e36e 100644 --- a/channels/stable +++ b/channels/stable @@ -4,27 +4,41 @@ 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-2017-07-28 + - name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 providerID: aws kubernetesVersion: ">=1.5.0 <1.6.0" - - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2017-07-28 + - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2017-12-02 providerID: aws kubernetesVersion: ">=1.6.0 <1.7.0" - - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-07-28 + - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 providerID: aws - kubernetesVersion: ">=1.7.0" + kubernetesVersion: ">=1.7.0 <1.8.0" + - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2017-12-02 + providerID: aws + kubernetesVersion: ">=1.8.0 <1.9.0" + # Moving to stretch in 1.9 (if goes well) + - name: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2017-12-02 + providerID: aws + kubernetesVersion: ">=1.9.0 <1.10.0" + # Need stretch as default in 1.10 (for nvme) + - name: kope.io/k8s-1.8-debian-stretch-amd64-hvm-ebs-2017-12-02 + providerID: aws + kubernetesVersion: ">=1.10.0" - providerID: gce name: "cos-cloud/cos-stable-60-9592-90-0" cluster: - kubernetesVersion: v1.5.7 + kubernetesVersion: v1.5.8 networking: kubenet: {} kubernetesVersions: + - range: ">=1.8.0" + recommendedVersion: 1.8.4 + requiredVersion: 1.8.0 - range: ">=1.7.0" - recommendedVersion: 1.7.10 + recommendedVersion: 1.7.11 requiredVersion: 1.7.0 - range: ">=1.6.0" - recommendedVersion: 1.6.11 + recommendedVersion: 1.6.13 requiredVersion: 1.6.0 - range: ">=1.5.0" recommendedVersion: 1.5.8 @@ -33,14 +47,18 @@ spec: recommendedVersion: 1.4.12 requiredVersion: 1.4.2 kopsVersions: + - range: ">=1.8.0-alpha.1" + recommendedVersion: 1.8.0 + #requiredVersion: 1.8.0 + kubernetesVersion: 1.8.4 - range: ">=1.7.0-alpha.1" recommendedVersion: 1.7.1 #requiredVersion: 1.7.0 - kubernetesVersion: 1.7.10 + kubernetesVersion: 1.7.11 - range: ">=1.6.0-alpha.1" #recommendedVersion: 1.6.0 #requiredVersion: 1.6.0 - kubernetesVersion: 1.6.11 + kubernetesVersion: 1.6.13 - range: ">=1.5.0-alpha1" recommendedVersion: 1.5.1 #requiredVersion: 1.5.1 diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml index 96c9478e2a315..2ab509b4a4cd2 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-2017-07-28 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 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 ab5b08527dc67..4c94e140eb589 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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 1c07fd5761daa..5c32819f7e1ca 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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 d0960bc0db0fa..d1e87c491ee2b 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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 b2a45ea6cd3c1..0150685a96690 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 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 62552641a3943..b80884d7339ce 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-2017-07-28 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 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-2017-07-28 + image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 machineType: t2.medium maxSize: 2 minSize: 2