Skip to content

Commit dc348fa

Browse files
authored
Update to k8s-1.33.5 (#238)
* Update to k8s-1.33.5 versions.yaml * Update csctl.yaml also to 1.33.5 * Allow 0 size root disk (with diskful flavors) Also update description to instruct users accordingly. For now, we do not change defaults from 50GiB root disks. Signed-off-by: Kurt Garloff <[email protected]>
1 parent f5f9a42 commit dc348fa

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

providers/openstack/scs2/cluster-class/templates/cluster-class.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ spec:
117117
openAPIV3Schema:
118118
type: string
119119
default: "SCS-2V-4"
120-
example: "SCS-2V-4"
120+
example: "SCS-2V-4-20s"
121121
description: |-
122122
OpenStack instance flavor for control plane nodes.
123123
(Default: SCS-2V-4, replace by SCS-2V-4-20s or specify a controlPlaneRootDisk.)
@@ -126,13 +126,13 @@ spec:
126126
schema:
127127
openAPIV3Schema:
128128
type: integer
129-
minimum: 1
129+
minimum: 0
130130
example: 25
131131
default: 50
132132
description: |-
133133
Root disk size in GiB for control-plane nodes.
134134
OpenStack volume will be created and used instead of an ephemeral disk defined in flavor.
135-
Should only be used for the diskless flavors.
135+
Should only be used for the diskless flavors (>= 20), otherwise set to 0.
136136
- name: controlPlaneServerGroupID
137137
required: false
138138
schema:
@@ -173,13 +173,13 @@ spec:
173173
schema:
174174
openAPIV3Schema:
175175
type: integer
176-
minimum: 1
176+
minimum: 0
177177
example: 25
178178
default: 50
179179
description: |-
180180
Root disk size in GiB for worker nodes.
181181
OpenStack volume will be created and used instead of an ephemeral disk defined in flavor.
182-
Should be used for the diskless flavors.
182+
Should be used for the diskless flavors (>= 20), otherwise set to 0.
183183
- name: workerServerGroupID
184184
required: false
185185
schema:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1
22
config:
33
clusterStackName: scs2
4-
kubernetesVersion: v1.33.4
4+
kubernetesVersion: v1.33.5
55
provider:
66
apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1
77
type: openstack

providers/openstack/scs2/versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
- kubernetes: 1.32.8
55
cinder_csi: 2.32.2
66
occm: 2.32.0
7-
- kubernetes: 1.33.4
7+
- kubernetes: 1.33.5
88
cinder_csi: 2.33.1
99
occm: 2.33.1

0 commit comments

Comments
 (0)