-
Notifications
You must be signed in to change notification settings - Fork 8
chore(cluster stacks): Update Cluster Stacks Addons and Kubernetes to… #230
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9ce8f8f
chore(cluster stacks): Update Cluster Stacks Addons and Kubernetes to…
jschoone 6475c10
Merge branch 'main' into chore/update_kubernetes_1_32_5
garloff d0d2798
Merge branch 'main' into chore/update_kubernetes_1_32_5
garloff c1be028
Fix yamllint complaints.
garloff 837653b
Merge branch 'main' into chore/update_kubernetes_1_32_5
garloff 459f5a1
Merge branch 'main' into chore/update_kubernetes_1_32_5
garloff File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| dependencies: | ||
| - name: openstack-cloud-controller-manager | ||
| repository: https://kubernetes.github.io/cloud-provider-openstack | ||
| version: 2.31.1 | ||
| digest: sha256:37581a55204e3d55a12413fec097c8f8ab2fa6e3c43f0c6b2a13ad5f94e366ab | ||
| generated: "2025-01-31T08:56:58.099398117+01:00" | ||
| version: 2.32.0 | ||
| digest: sha256:251e0efadca5de3ef39707c196a64a5d5292427faf4163ce8295d416d6e8c355 | ||
| generated: "2025-05-28T21:50:59.574735035+02:00" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| apiVersion: v2 | ||
| type: application | ||
| dependencies: | ||
| - alias: openstack-cloud-controller-manager | ||
| name: openstack-cloud-controller-manager | ||
| repository: https://kubernetes.github.io/cloud-provider-openstack | ||
| version: 2.32.0 | ||
| description: CCM | ||
| name: CCM | ||
| name: openstack-scs-1-32-cluster-addon | ||
| type: application | ||
| version: v1 | ||
| dependencies: | ||
| - alias: openstack-cloud-controller-manager | ||
| name: openstack-cloud-controller-manager | ||
| repository: https://kubernetes.github.io/cloud-provider-openstack | ||
| version: 2.31.1 |
Binary file removed
BIN
-18.5 KB
...ders/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz
Binary file not shown.
Binary file added
BIN
+18.5 KB
...ders/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.32.0.tgz
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| apiVersion: v2 | ||
| type: application | ||
| dependencies: | ||
| - alias: cilium | ||
| name: cilium | ||
| repository: https://helm.cilium.io/ | ||
| version: 1.17.4 | ||
| description: CNI | ||
| name: CNI | ||
| name: openstack-scs-1-32-cluster-addon | ||
| type: application | ||
| version: v1 | ||
| dependencies: | ||
| - alias: cilium | ||
| name: cilium | ||
| repository: https://helm.cilium.io/ | ||
| version: 1.17.4 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| dependencies: | ||
| - name: openstack-cinder-csi | ||
| repository: https://kubernetes.github.io/cloud-provider-openstack | ||
| version: 2.31.2 | ||
| digest: sha256:c4dae4f651e1be8b82347d74df884fb5c7503e4b9e5d4db9424fa7fdf2e447d7 | ||
| generated: "2025-01-31T08:58:29.735075689+01:00" | ||
| version: 2.32.0 | ||
| digest: sha256:86fda0773b17ffa6ae496715f005d132d987a79cbf9a7c16ca5eb96942fb630b | ||
| generated: "2025-05-28T21:50:56.213810258+02:00" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| apiVersion: v2 | ||
| type: application | ||
| dependencies: | ||
| - alias: openstack-cinder-csi | ||
| name: openstack-cinder-csi | ||
| repository: https://kubernetes.github.io/cloud-provider-openstack | ||
| version: 2.32.0 | ||
| description: CSI | ||
| name: CSI | ||
| name: openstack-scs-1-32-cluster-addon | ||
| type: application | ||
| version: v1 | ||
| dependencies: | ||
| - alias: openstack-cinder-csi | ||
| name: openstack-cinder-csi | ||
| repository: https://kubernetes.github.io/cloud-provider-openstack | ||
| version: 2.31.2 |
Binary file removed
BIN
-6.72 KB
providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz
Binary file not shown.
Binary file added
BIN
+6.93 KB
providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.32.0.tgz
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| apiVersion: v2 | ||
| type: application | ||
| dependencies: | ||
| - alias: metrics-server | ||
| name: metrics-server | ||
| repository: https://kubernetes-sigs.github.io/metrics-server/ | ||
| version: 3.12.2 | ||
| description: Metrics Server | ||
| name: metrics-server | ||
| name: openstack-scs-1-32-cluster-addon | ||
| type: application | ||
| version: v1 | ||
| dependencies: | ||
| - name: "metrics-server" | ||
| version: "3.12.2" | ||
| repository: "https://kubernetes-sigs.github.io/metrics-server/" | ||
| alias: "metrics-server" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| apiVersion: v2 | ||
| description: "This chart installs and configures: | ||
| description: 'This chart installs and configures: | ||
|
|
||
| * Openstack scs Cluster Class | ||
|
|
||
| " | ||
| ' | ||
| name: openstack-scs-1-32-cluster-class | ||
| type: application | ||
| version: v1 |
30 changes: 14 additions & 16 deletions
30
providers/openstack/scs/cluster-class/templates/image.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,30 @@ | ||
| --- | ||
| apiVersion: openstack.k-orc.cloud/v1alpha1 | ||
| kind: Image | ||
| metadata: | ||
| name: "{{ .Values.images.worker.name }}" | ||
| name: '{{ .Values.images.worker.name }}' | ||
| spec: | ||
| cloudCredentialsRef: | ||
| cloudName: "{{ .Values.identityRef.cloudName }}" | ||
| secretName: "{{ .Values.identityRef.name }}" | ||
| cloudName: '{{ .Values.identityRef.cloudName }}' | ||
| secretName: '{{ .Values.identityRef.name }}' | ||
| managementPolicy: managed | ||
| resource: | ||
| content: | ||
| diskFormat: qcow2 | ||
| download: | ||
| hash: | ||
| algorithm: sha256 | ||
| value: 8bfad5cb331480a7530952d8d6ff41155c28b2941f8be7a3f0318ebd1569cf83 | ||
| url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.32/ubuntu-2204-kube-v1.32.5.qcow2 | ||
| properties: | ||
| architecture: x86_64 | ||
| hardware: | ||
| diskBus: scsi | ||
| scsiModel: virtio-scsi | ||
| vifModel: virtio | ||
| qemuGuestAgent: true | ||
| rngModel: virtio | ||
| architecture: x86_64 | ||
| scsiModel: virtio-scsi | ||
| vifModel: virtio | ||
| minDiskGB: 20 | ||
| minMemoryMB: 2048 | ||
| operatingSystem: | ||
| distro: ubuntu | ||
| version: "22.04" | ||
| # hypervisorType: kvm # kvm not officially supported, could use qemu | ||
| content: | ||
| diskFormat: qcow2 | ||
| download: | ||
| url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube-v1.32/ubuntu-2204-kube-v1.32.1.qcow2 | ||
| hash: | ||
| algorithm: sha256 | ||
| value: 1d261cd043f1c16a676be9079984c912df82387be4c6766b122a966e266a080c | ||
| version: '22.04' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,12 @@ | ||
| # mirrored from variables.tf | ||
| controller_flavor: SCS-2V-4-20s | ||
| worker_flavor: SCS-2V-4-20 | ||
| restrict_kubeapi: [] | ||
| # newly introduced: | ||
| openstack_loadbalancer_apiserver: false | ||
| # TBD, currently needed: | ||
| identityRef: | ||
| cloudName: openstack | ||
| name: openstack | ||
| images: | ||
| controlPlane: | ||
| name: ubuntu-capi-image-v1.32.1 | ||
| name: ubuntu-capi-image-v1.32.5 | ||
| worker: | ||
| name: ubuntu-capi-image-v1.32.1 | ||
| identityRef: | ||
| name: openstack | ||
| cloudName: openstack | ||
| name: ubuntu-capi-image-v1.32.5 | ||
| openstack_loadbalancer_apiserver: false | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This changes the default to not have a LB in front of the kubernetes-apiserver. Why? |
||
| restrict_kubeapi: [] | ||
| worker_flavor: SCS-2V-4-20 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| apiVersion: csctl.clusterstack.x-k8s.io/v1alpha1 | ||
| config: | ||
| clusterStackName: scs | ||
| kubernetesVersion: v1.32.1 | ||
| kubernetesVersion: v1.32.5 | ||
| provider: | ||
| apiVersion: openstack.csctl.clusterstack.x-k8s.io/v1alpha1 | ||
| type: openstack |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| - kubernetes: 1.30.11 | ||
| - kubernetes: 1.30.13 | ||
| cinder_csi: 2.30.3 | ||
| occm: 2.30.5 | ||
| - kubernetes: 1.31.7 | ||
| - kubernetes: 1.31.9 | ||
| cinder_csi: 2.31.7 | ||
| occm: 2.31.3 | ||
| - kubernetes: 1.32.3 | ||
| - kubernetes: 1.32.5 | ||
| cinder_csi: 2.32.0 | ||
| occm: 2.32.0 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This duplicates the
dependencies:section rather than just moving it so yamllint rightly complains.