Merge pull request #3103 from justinsb/update_channel

Automatic merge from submit-queue

Update alpha channel with update image & versions
This commit is contained in:
Kubernetes Submit Queue 2017-08-10 16:26:35 -07:00 committed by GitHub
commit 4119cc57f6
1 changed files with 14 additions and 8 deletions

View File

@ -1,15 +1,18 @@
spec:
images:
# We put the "legacy" version first, for kops versions that don't support versions ( < 1.5.0 )
- name: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-05-02
- 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-05-02
- name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-07-28
providerID: aws
kubernetesVersion: ">=1.5.0 <1.6.0"
- name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2017-05-02
- name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2017-07-28
providerID: aws
kubernetesVersion: ">=1.6.0"
kubernetesVersion: ">=1.6.0 <1.7.0"
- name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-07-28
providerID: aws
kubernetesVersion: ">=1.7.0"
- providerID: gce
name: "cos-cloud/cos-stable-57-9202-64-0"
cluster:
@ -17,6 +20,9 @@ spec:
networking:
kubenet: {}
kubernetesVersions:
- range: ">=1.7.0"
recommendedVersion: 1.7.2
requiredVersion: 1.7.0
- range: ">=1.6.0"
recommendedVersion: 1.6.6
requiredVersion: 1.6.0
@ -28,13 +34,13 @@ spec:
requiredVersion: 1.4.2
kopsVersions:
- range: ">=1.7.0-alpha.1"
#recommendedVersion: 1.6.0
#requiredVersion: 1.6.0
kubernetesVersion: 1.7.0
recommendedVersion: 1.7.0
#requiredVersion: 1.7.0
kubernetesVersion: 1.7.2
- range: ">=1.6.0-alpha.1"
#recommendedVersion: 1.6.0
#requiredVersion: 1.6.0
kubernetesVersion: 1.6.6
kubernetesVersion: 1.6.7
- range: ">=1.5.0-alpha1"
recommendedVersion: 1.5.1
#requiredVersion: 1.5.1