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.

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 #15695

Merged
merged 3 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions channels/alpha
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@ spec:
kubenet: {}
kubernetesVersions:
- range: ">=1.27.0"
recommendedVersion: 1.27.3
recommendedVersion: 1.27.4
requiredVersion: 1.27.0
- range: ">=1.26.0"
recommendedVersion: 1.26.6
recommendedVersion: 1.26.7
requiredVersion: 1.26.0
- range: ">=1.25.0"
recommendedVersion: 1.25.11
recommendedVersion: 1.25.12
requiredVersion: 1.25.0
- range: ">=1.24.0"
recommendedVersion: 1.24.15
recommendedVersion: 1.24.16
requiredVersion: 1.24.0
- range: ">=1.23.0"
recommendedVersion: 1.23.17
Expand Down Expand Up @@ -161,19 +161,19 @@ spec:
- range: ">=1.27.0-alpha.1"
recommendedVersion: "1.27.0"
#requiredVersion: 1.27.0
kubernetesVersion: 1.27.3
kubernetesVersion: 1.27.4
- range: ">=1.26.0-alpha.1"
recommendedVersion: "1.27.0"
#requiredVersion: 1.26.0
kubernetesVersion: 1.26.6
kubernetesVersion: 1.26.7
- range: ">=1.25.0-alpha.1"
recommendedVersion: "1.27.0"
#requiredVersion: 1.25.0
kubernetesVersion: 1.25.11
kubernetesVersion: 1.25.12
- range: ">=1.24.0-alpha.1"
recommendedVersion: "1.27.0"
#requiredVersion: 1.24.0
kubernetesVersion: 1.24.15
kubernetesVersion: 1.24.16
- range: ">=1.23.0-alpha.1"
recommendedVersion: "1.27.0"
#requiredVersion: 1.23.0
Expand Down
28 changes: 14 additions & 14 deletions channels/stable
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,19 @@ spec:
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.17.0 <1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.18.0 <1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20230616
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20230714
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230608
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230711
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230608
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20230711
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.27.0"
Expand All @@ -82,19 +82,19 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
- name: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0 <1.27.0"
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20230606
- name: ubuntu-os-cloud/ubuntu-2204-jammy-v20230714
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.27.0"
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202303020
- name: Canonical:0001-com-ubuntu-server-focal:20_04-lts-gen2:20.04.202307140
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202306010
- name: Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202307010
providerID: azure
architectureID: amd64
kubernetesVersion: ">=1.27.0"
Expand Down Expand Up @@ -163,27 +163,27 @@ spec:
#requiredVersion: 1.27.0
kubernetesVersion: 1.27.3
- range: ">=1.26.0-alpha.1"
recommendedVersion: "1.26.4"
recommendedVersion: "1.26.5"
#requiredVersion: 1.26.0
kubernetesVersion: 1.26.6
- range: ">=1.25.0-alpha.1"
recommendedVersion: "1.26.4"
recommendedVersion: "1.26.5"
#requiredVersion: 1.25.0
kubernetesVersion: 1.25.11
- range: ">=1.24.0-alpha.1"
recommendedVersion: "1.26.4"
recommendedVersion: "1.26.5"
#requiredVersion: 1.24.0
kubernetesVersion: 1.24.15
- range: ">=1.23.0-alpha.1"
recommendedVersion: "1.26.4"
recommendedVersion: "1.26.5"
#requiredVersion: 1.23.0
kubernetesVersion: 1.23.17
- range: ">=1.22.0-alpha.1"
recommendedVersion: "1.26.4"
recommendedVersion: "1.26.5"
#requiredVersion: 1.22.0
kubernetesVersion: 1.22.17
- range: ">=1.21.0-alpha.1"
recommendedVersion: "1.26.4"
recommendedVersion: "1.26.5"
#requiredVersion: 1.21.0
kubernetesVersion: 1.21.14
- range: ">=1.20.0-alpha.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -90,7 +90,7 @@ metadata:
kops.k8s.io/cluster: minimal.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: control-plane-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand All @@ -86,7 +86,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/ha/expected-v1alpha2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -106,7 +106,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -126,7 +126,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -146,7 +146,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -167,7 +167,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -188,7 +188,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -106,7 +106,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -126,7 +126,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -146,7 +146,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -167,7 +167,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -188,7 +188,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: control-plane-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand All @@ -93,7 +93,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: control-plane-us-test1-b
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand All @@ -113,7 +113,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: control-plane-us-test1-c
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand All @@ -133,7 +133,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand All @@ -155,7 +155,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-b
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand All @@ -177,7 +177,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-c
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230302
image: ubuntu-os-cloud/ubuntu-2004-focal-v20230715
machineType: e2-medium
maxSize: 1
minSize: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-1
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -98,7 +98,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-2
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -118,7 +118,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: control-plane-us-test-1a-3
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -138,7 +138,7 @@ metadata:
kops.k8s.io/cluster: ha.example.com
name: nodes-us-test-1a
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230616
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230714
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
Loading
Loading