Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote alpha channel to stable #3996

Merged
merged 1 commit into from
Dec 3, 2017
+48 −30
Merged

Promote alpha channel to stable #3996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion channels/alpha
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
36 changes: 27 additions & 9 deletions channels/stable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/create_cluster/complex/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/create_cluster/ha/expected-v1alpha1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/create_cluster/ha/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/create_cluster/ha_encrypt/expected-v1alpha1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down