kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3238 from justinsb/bump_stable_channel 

Automatic merge from submit-queue

Promote alpha to stable channel
This commit is contained in:
Kubernetes Submit Queue 2017-08-23 22:27:34 -07:00 committed by GitHub
parent 34473e8602 185fa9689f
commit c1652dc4ce
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
channels/stable
View File

@ -1,15 +1,18 @@
spec: spec:
images: images:
# We put the "legacy" version first, for kops versions that don't support versions ( < 1.5.0 ) # 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 providerID: aws
kubernetesVersion: ">=1.4.0 <1.5.0" 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 providerID: aws
kubernetesVersion: ">=1.5.0 <1.6.0" 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 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 - providerID: gce
name: "cos-cloud/cos-stable-57-9202-64-0" name: "cos-cloud/cos-stable-57-9202-64-0"
cluster: cluster:
@ -17,8 +20,11 @@ spec:
networking: networking:
kubenet: {} kubenet: {}
kubernetesVersions: kubernetesVersions:
- range: ">=1.7.0"
recommendedVersion: 1.7.2
requiredVersion: 1.7.0
- range: ">=1.6.0" - range: ">=1.6.0"
recommendedVersion: 1.6.2 recommendedVersion: 1.6.6
requiredVersion: 1.6.0 requiredVersion: 1.6.0
- range: ">=1.5.0" - range: ">=1.5.0"
recommendedVersion: 1.5.7 recommendedVersion: 1.5.7
@ -28,13 +34,13 @@ spec:
requiredVersion: 1.4.2 requiredVersion: 1.4.2
kopsVersions: kopsVersions:
- range: ">=1.7.0-alpha.1" - range: ">=1.7.0-alpha.1"
#recommendedVersion: 1.6.0 recommendedVersion: 1.7.0
#requiredVersion: 1.6.0 #requiredVersion: 1.7.0
kubernetesVersion: 1.7.0 kubernetesVersion: 1.7.2
- range: ">=1.6.0-alpha.1" - range: ">=1.6.0-alpha.1"
#recommendedVersion: 1.6.0 #recommendedVersion: 1.6.0
#requiredVersion: 1.6.0 #requiredVersion: 1.6.0
kubernetesVersion: 1.6.2 kubernetesVersion: 1.6.7
- range: ">=1.5.0-alpha1" - range: ">=1.5.0-alpha1"
recommendedVersion: 1.5.1 recommendedVersion: 1.5.1
#requiredVersion: 1.5.1 #requiredVersion: 1.5.1