Skip to content

Commit

Permalink
Merge pull request #15979 from moshevayner/promote-alpha-to-stable-20…
Browse files Browse the repository at this point in the history
…23-09-29

Promote alpha to stable
  • Loading branch information
k8s-ci-robot committed Sep 29, 2023
2 parents e12f3dc + 89aa632 commit ecda9e8
Show file tree
Hide file tree
Showing 27 changed files with 93 additions and 93 deletions.
28 changes: 14 additions & 14 deletions channels/stable
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ spec:
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.17.0 <1.18.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.18.0 <1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20230814
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20230918
providerID: aws
architectureID: arm64
kubernetesVersion: ">=1.20.0 <1.27.0"
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230728
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20230919
providerID: aws
architectureID: amd64
kubernetesVersion: ">=1.27.0"
Expand Down Expand Up @@ -104,16 +104,16 @@ spec:
kubenet: {}
kubernetesVersions:
- range: ">=1.28.0"
recommendedVersion: 1.28.1
recommendedVersion: 1.28.2
requiredVersion: 1.28.0
- range: ">=1.27.0"
recommendedVersion: 1.27.5
recommendedVersion: 1.27.6
requiredVersion: 1.27.0
- range: ">=1.26.0"
recommendedVersion: 1.26.8
recommendedVersion: 1.26.9
requiredVersion: 1.26.0
- range: ">=1.25.0"
recommendedVersion: 1.25.13
recommendedVersion: 1.25.14
requiredVersion: 1.25.0
- range: ">=1.24.0"
recommendedVersion: 1.24.17
Expand Down Expand Up @@ -164,21 +164,21 @@ spec:
- range: ">=1.27.0-alpha.1"
recommendedVersion: "1.27.0"
#requiredVersion: 1.27.0
kubernetesVersion: 1.27.5
kubernetesVersion: 1.27.6
- range: ">=1.26.0-alpha.1"
recommendedVersion: "1.26.5"
recommendedVersion: "1.27.0"
#requiredVersion: 1.26.0
kubernetesVersion: 1.26.8
kubernetesVersion: 1.26.9
- range: ">=1.25.0-alpha.1"
recommendedVersion: "1.26.5"
recommendedVersion: "1.27.0"
#requiredVersion: 1.25.0
kubernetesVersion: 1.25.13
kubernetesVersion: 1.25.14
- range: ">=1.24.0-alpha.1"
recommendedVersion: "1.26.5"
recommendedVersion: "1.27.0"
#requiredVersion: 1.24.0
kubernetesVersion: 1.24.17
- range: ">=1.23.0-alpha.1"
recommendedVersion: "1.26.5"
recommendedVersion: "1.27.0"
#requiredVersion: 1.23.0
kubernetesVersion: 1.23.17
- range: ">=1.22.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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: bastions
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -165,7 +165,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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -185,7 +185,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -205,7 +205,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -225,7 +225,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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -247,7 +247,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -268,7 +268,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/complex/expected-v1alpha2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -126,7 +126,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -146,7 +146,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: control-plane-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpTokens: required
machineType: m3.medium
Expand All @@ -166,7 +166,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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -188,7 +188,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1b
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand All @@ -209,7 +209,7 @@ metadata:
kops.k8s.io/cluster: complex.example.com
name: nodes-us-test-1c
spec:
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
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-20230814
image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230918
instanceMetadata:
httpPutResponseHopLimit: 1
httpTokens: required
Expand Down
Loading

0 comments on commit ecda9e8

Please sign in to comment.