Skip to content

Update to k8s-1.33.5 #238

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

Merged
garloff merged 5 commits into from
Dec 4, 2025
Merged

Update to k8s-1.33.5 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b765e59
Update to k8s-1.33.5 versions.yaml
garloff Nov 28, 2025
93d0e12
Also adjust k8s version in csctl file.
garloff Nov 28, 2025
e6cb45a
Update csctl.yaml also to 1.33.5
garloff Nov 28, 2025
3a98f47
Merge branch 'feat/update-to-k8s-1.33.5' of github.com:SovereignCloud…
garloff Nov 30, 2025
f784766
Allow 0 size root disk (with diskful flavors)
garloff Nov 30, 2025
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
10 changes: 5 additions & 5 deletions providers/openstack/scs2/cluster-class/templates/cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
openAPIV3Schema:
type: string
default: "SCS-2V-4"
example: "SCS-2V-4"
example: "SCS-2V-4-20s"
description: |-
OpenStack instance flavor for control plane nodes.
(Default: SCS-2V-4, replace by SCS-2V-4-20s or specify a controlPlaneRootDisk.)
Expand All @@ -126,13 +126,13 @@ spec:
schema:
openAPIV3Schema:
type: integer
minimum: 1
minimum: 0
example: 25
default: 50
description: |-
Root disk size in GiB for control-plane nodes.
OpenStack volume will be created and used instead of an ephemeral disk defined in flavor.
Should only be used for the diskless flavors.
Should only be used for the diskless flavors (>= 20), otherwise set to 0.
- name: controlPlaneServerGroupID
required: false
schema:
Expand Down Expand Up @@ -173,13 +173,13 @@ spec:
schema:
openAPIV3Schema:
type: integer
minimum: 1
minimum: 0
example: 25
default: 50
description: |-
Root disk size in GiB for worker nodes.
OpenStack volume will be created and used instead of an ephemeral disk defined in flavor.
Should be used for the diskless flavors.
Should be used for the diskless flavors (>= 20), otherwise set to 0.
- name: workerServerGroupID
required: false
schema:
Expand Down
2 changes: 1 addition & 1 deletion providers/openstack/scs2/csctl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1
config:
clusterStackName: scs2
kubernetesVersion: v1.33.4
kubernetesVersion: v1.33.5
provider:
apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1
type: openstack
2 changes: 1 addition & 1 deletion providers/openstack/scs2/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
- kubernetes: 1.32.8
cinder_csi: 2.32.2
occm: 2.32.0
- kubernetes: 1.33.4
- kubernetes: 1.33.5
cinder_csi: 2.33.1
occm: 2.33.1
Loading