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

Merge pull request #4284 from justinsb/bump_alpha_to_stable 

Copy alpha channel to stable
This commit is contained in:
k8s-ci-robot 2018-01-20 09:15:26 -08:00 committed by GitHub
parent 9751f89f31 da55c5eaee
commit 68146fa4de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
channels/stable
View File

@ -4,26 +4,24 @@ spec:
- name: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2017-07-28 - 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-12-02 - name: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
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-12-02 - name: kope.io/k8s-1.6-debian-jessie-amd64-hvm-ebs-2018-01-05
providerID: aws providerID: aws
kubernetesVersion: ">=1.6.0 <1.7.0" kubernetesVersion: ">=1.6.0 <1.7.0"
- name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 - name: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05
providerID: aws providerID: aws
kubernetesVersion: ">=1.7.0 <1.8.0" kubernetesVersion: ">=1.7.0 <1.8.0"
- name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2017-12-02 - name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2018-01-05
providerID: aws providerID: aws
kubernetesVersion: ">=1.8.0 <1.9.0" kubernetesVersion: ">=1.8.0 <1.9.0"
# Moving to stretch in 1.9 (if goes well) # Moving to stretch in 1.9 (if goes well)
# 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-stretch-amd64-hvm-ebs-2018-01-05
- name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2017-12-02
providerID: aws providerID: aws
kubernetesVersion: ">=1.9.0 <1.10.0" kubernetesVersion: ">=1.9.0 <1.10.0"
# Need stretch as default in 1.10 (for nvme) # 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-stretch-amd64-hvm-ebs-2018-01-05
- name: kope.io/k8s-1.8-debian-jessie-amd64-hvm-ebs-2017-12-02
providerID: aws providerID: aws
kubernetesVersion: ">=1.10.0" kubernetesVersion: ">=1.10.0"
- providerID: gce - providerID: gce
@ -34,7 +32,7 @@ spec:
kubenet: {} kubenet: {}
kubernetesVersions: kubernetesVersions:
- range: ">=1.8.0" - range: ">=1.8.0"
recommendedVersion: 1.8.4 recommendedVersion: 1.8.6
requiredVersion: 1.8.0 requiredVersion: 1.8.0
- range: ">=1.7.0" - range: ">=1.7.0"
recommendedVersion: 1.7.11 recommendedVersion: 1.7.11
@ -52,7 +50,7 @@ spec:
- range: ">=1.8.0-alpha.1" - range: ">=1.8.0-alpha.1"
recommendedVersion: 1.8.0 recommendedVersion: 1.8.0
#requiredVersion: 1.8.0 #requiredVersion: 1.8.0
kubernetesVersion: 1.8.4 kubernetesVersion: 1.8.6
- range: ">=1.7.0-alpha.1" - range: ">=1.7.0-alpha.1"
recommendedVersion: 1.7.1 recommendedVersion: 1.7.1
#requiredVersion: 1.7.0 #requiredVersion: 1.7.0

4
tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View File

@ -54,7 +54,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -74,7 +74,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com kops.k8s.io/cluster: complex.example.com
name: nodes name: nodes
spec: spec:
image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: t2.medium machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha/expected-v1alpha1.yaml
View File

@ -62,7 +62,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -82,7 +82,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -102,7 +102,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -122,7 +122,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: t2.medium machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha/expected-v1alpha2.yaml
View File

@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -90,7 +90,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -110,7 +110,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -130,7 +130,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: t2.medium machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml
View File

@ -68,7 +68,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -88,7 +88,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -108,7 +108,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -128,7 +128,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: t2.medium machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

8
tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
View File

@ -76,7 +76,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -96,7 +96,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1b name: master-us-test-1b
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: master-us-test-1c name: master-us-test-1c
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -136,7 +136,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com kops.k8s.io/cluster: ha.example.com
name: nodes name: nodes
spec: spec:
image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.5-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: t2.medium machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2

4
tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
View File

@ -57,7 +57,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: master-us-test-1a name: master-us-test-1a
spec: spec:
image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: m3.medium machineType: m3.medium
maxSize: 1 maxSize: 1
minSize: 1 minSize: 1
@ -77,7 +77,7 @@ metadata:
kops.k8s.io/cluster: overrides.example.com kops.k8s.io/cluster: overrides.example.com
name: nodes name: nodes
spec: spec:
image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2017-12-02 image: kope.io/k8s-1.7-debian-jessie-amd64-hvm-ebs-2018-01-05
machineType: t2.medium machineType: t2.medium
maxSize: 2 maxSize: 2
minSize: 2 minSize: 2