diff --git a/providers/openstack/scs/cluster-addon/Chart.lock b/providers/openstack/scs/cluster-addon/Chart.lock deleted file mode 100644 index fb7e2cf6..00000000 --- a/providers/openstack/scs/cluster-addon/Chart.lock +++ /dev/null @@ -1,15 +0,0 @@ -dependencies: -- name: metrics-server - repository: https://kubernetes-sigs.github.io/metrics-server/ - version: 3.12.2 -- name: cilium - repository: https://helm.cilium.io/ - version: 1.16.7 -- name: openstack-cloud-controller-manager - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.30.4 -- name: openstack-cinder-csi - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.30.2 -digest: sha256:06feb5e63933251c45459c9a6782add984f5369b381f4e454eab45f7a99cd3b2 -generated: "2025-02-27T12:01:13.556210866+01:00" diff --git a/providers/openstack/scs/cluster-addon/Chart.yaml b/providers/openstack/scs/cluster-addon/Chart.yaml deleted file mode 100644 index 9c63b627..00000000 --- a/providers/openstack/scs/cluster-addon/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v2 -dependencies: - - alias: metrics-server - name: metrics-server - repository: https://kubernetes-sigs.github.io/metrics-server/ - version: 3.12.2 - - alias: cilium - name: cilium - repository: https://helm.cilium.io/ - version: 1.16.7 - - alias: openstack-cloud-controller-manager - name: openstack-cloud-controller-manager - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.30.4 - - alias: openstack-cinder-csi - name: openstack-cinder-csi - repository: https://kubernetes.github.io/cloud-provider-openstack - version: 2.30.2 -name: openstack-scs-1-30-cluster-addon -type: application -version: v1 diff --git a/providers/openstack/scs/cluster-addon/ccm/Chart.lock b/providers/openstack/scs/cluster-addon/ccm/Chart.lock new file mode 100644 index 00000000..3331b6a8 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/ccm/Chart.lock @@ -0,0 +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" diff --git a/providers/openstack/scs/cluster-addon/ccm/Chart.yaml b/providers/openstack/scs/cluster-addon/ccm/Chart.yaml new file mode 100644 index 00000000..551ba1f9 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/ccm/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +type: application +description: CCM +name: CCM +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 diff --git a/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz b/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz new file mode 100644 index 00000000..c34df7a0 Binary files /dev/null and b/providers/openstack/scs/cluster-addon/ccm/charts/openstack-cloud-controller-manager-2.31.1.tgz differ diff --git a/providers/openstack/scs/cluster-addon/ccm/values.yaml b/providers/openstack/scs/cluster-addon/ccm/values.yaml new file mode 100644 index 00000000..770706c7 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/ccm/values.yaml @@ -0,0 +1,13 @@ +openstack-cloud-controller-manager: + secret: + enabled: true + name: cloud-config + create: false + nodeSelector: + node-role.kubernetes.io/control-plane: "" + tolerations: + - key: node.cloudprovider.kubernetes.io/uninitialized + value: "true" + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule diff --git a/providers/openstack/scs/cluster-addon/charts/cilium-1.16.7.tgz b/providers/openstack/scs/cluster-addon/charts/cilium-1.16.7.tgz deleted file mode 100644 index ea7417ee..00000000 Binary files a/providers/openstack/scs/cluster-addon/charts/cilium-1.16.7.tgz and /dev/null differ diff --git a/providers/openstack/scs/cluster-addon/charts/openstack-cinder-csi-2.30.2.tgz b/providers/openstack/scs/cluster-addon/charts/openstack-cinder-csi-2.30.2.tgz deleted file mode 100644 index 58fccdc4..00000000 Binary files a/providers/openstack/scs/cluster-addon/charts/openstack-cinder-csi-2.30.2.tgz and /dev/null differ diff --git a/providers/openstack/scs/cluster-addon/charts/openstack-cloud-controller-manager-2.30.4.tgz b/providers/openstack/scs/cluster-addon/charts/openstack-cloud-controller-manager-2.30.4.tgz deleted file mode 100644 index 5ff56089..00000000 Binary files a/providers/openstack/scs/cluster-addon/charts/openstack-cloud-controller-manager-2.30.4.tgz and /dev/null differ diff --git a/providers/openstack/scs/cluster-addon/cni/Chart.lock b/providers/openstack/scs/cluster-addon/cni/Chart.lock new file mode 100644 index 00000000..f6602079 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/cni/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: cilium + repository: https://helm.cilium.io/ + version: 1.17.1 +digest: sha256:53c34069893b2a60b16c171d128e7cda9fd62ddb96210cde7c0d3c00d6d2f096 +generated: "2025-02-26T12:54:16.166712915+01:00" diff --git a/providers/openstack/scs/cluster-addon/cni/Chart.yaml b/providers/openstack/scs/cluster-addon/cni/Chart.yaml new file mode 100644 index 00000000..b25bda26 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/cni/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +type: application +description: CNI +name: CNI +version: v1 +dependencies: + - alias: cilium + name: cilium + repository: https://helm.cilium.io/ + version: 1.17.1 diff --git a/providers/openstack/scs/cluster-addon/cni/charts/cilium-1.17.1.tgz b/providers/openstack/scs/cluster-addon/cni/charts/cilium-1.17.1.tgz new file mode 100644 index 00000000..d95b80cb Binary files /dev/null and b/providers/openstack/scs/cluster-addon/cni/charts/cilium-1.17.1.tgz differ diff --git a/providers/openstack/scs/cluster-addon/cni/values.yaml b/providers/openstack/scs/cluster-addon/cni/values.yaml new file mode 100644 index 00000000..195534d0 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/cni/values.yaml @@ -0,0 +1,9 @@ +cilium: + tls: + secretsNamespace: + name: kube-system + sessionAffinity: true + sctp: + enabled: true + ipam: + mode: "kubernetes" diff --git a/providers/openstack/scs/cluster-addon/csi/Chart.lock b/providers/openstack/scs/cluster-addon/csi/Chart.lock new file mode 100644 index 00000000..121ca914 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/csi/Chart.lock @@ -0,0 +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" diff --git a/providers/openstack/scs/cluster-addon/csi/Chart.yaml b/providers/openstack/scs/cluster-addon/csi/Chart.yaml new file mode 100644 index 00000000..e56497ed --- /dev/null +++ b/providers/openstack/scs/cluster-addon/csi/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +type: application +description: CSI +name: CSI +version: v1 +dependencies: + - alias: openstack-cinder-csi + name: openstack-cinder-csi + repository: https://kubernetes.github.io/cloud-provider-openstack + version: 2.31.2 diff --git a/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz b/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz new file mode 100644 index 00000000..c79ea208 Binary files /dev/null and b/providers/openstack/scs/cluster-addon/csi/charts/openstack-cinder-csi-2.31.2.tgz differ diff --git a/providers/openstack/scs/cluster-addon/csi/values.yaml b/providers/openstack/scs/cluster-addon/csi/values.yaml new file mode 100644 index 00000000..83817b87 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/csi/values.yaml @@ -0,0 +1,16 @@ +openstack-cinder-csi: + secret: + enabled: true + name: cloud-config + create: false + nodeSelector: + node-role.kubernetes.io/control-plane: "" + tolerations: + - key: node.cloudprovider.kubernetes.io/uninitialized + value: "true" + effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule + storageClass: + delete: + isDefault: true diff --git a/providers/openstack/scs/cluster-addon/.helmignore b/providers/openstack/scs/cluster-addon/metrics-server/.helmignore similarity index 100% rename from providers/openstack/scs/cluster-addon/.helmignore rename to providers/openstack/scs/cluster-addon/metrics-server/.helmignore diff --git a/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock b/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock new file mode 100644 index 00000000..fa9531c7 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/metrics-server/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: metrics-server + repository: https://kubernetes-sigs.github.io/metrics-server/ + version: 3.12.2 +digest: sha256:b79715342d7c10e97664b5f4d79199044f5da6ef40cca906218cff05ca891122 +generated: "2025-01-10T10:10:00.37755764+01:00" diff --git a/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml b/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml new file mode 100644 index 00000000..8b390112 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/metrics-server/Chart.yaml @@ -0,0 +1,10 @@ +apiVersion: v2 +type: application +description: Metrics Server +name: metrics-server +version: v1 +dependencies: + - name: "metrics-server" + version: "3.12.2" + repository: "https://kubernetes-sigs.github.io/metrics-server/" + alias: "metrics-server" diff --git a/providers/openstack/scs/cluster-addon/charts/metrics-server-3.12.2.tgz b/providers/openstack/scs/cluster-addon/metrics-server/charts/metrics-server-3.12.2.tgz similarity index 100% rename from providers/openstack/scs/cluster-addon/charts/metrics-server-3.12.2.tgz rename to providers/openstack/scs/cluster-addon/metrics-server/charts/metrics-server-3.12.2.tgz diff --git a/providers/openstack/scs/cluster-addon/metrics-server/values.yaml b/providers/openstack/scs/cluster-addon/metrics-server/values.yaml new file mode 100644 index 00000000..a89bf027 --- /dev/null +++ b/providers/openstack/scs/cluster-addon/metrics-server/values.yaml @@ -0,0 +1,4 @@ +metrics-server: + fullnameOverride: metrics-server + args: + - --kubelet-insecure-tls diff --git a/providers/openstack/scs/cluster-addon/values.yaml b/providers/openstack/scs/cluster-addon/values.yaml deleted file mode 100644 index dbf59ca0..00000000 --- a/providers/openstack/scs/cluster-addon/values.yaml +++ /dev/null @@ -1,34 +0,0 @@ -metrics-server: - fullnameOverride: metrics-server - - args: - - --kubelet-insecure-tls -openstack-cloud-controller-manager: - secret: - enabled: true - name: cloud-config - create: false - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node.cloudprovider.kubernetes.io/uninitialized - value: "true" - effect: NoSchedule - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule -openstack-cinder-csi: - secret: - enabled: true - name: cloud-config - create: false - nodeSelector: - node-role.kubernetes.io/control-plane: "" - tolerations: - - key: node.cloudprovider.kubernetes.io/uninitialized - value: "true" - effect: NoSchedule - - key: node-role.kubernetes.io/control-plane - effect: NoSchedule - storageClass: - delete: - isDefault: true diff --git a/providers/openstack/scs/clusteraddon.yaml b/providers/openstack/scs/clusteraddon.yaml new file mode 100755 index 00000000..d346ba22 --- /dev/null +++ b/providers/openstack/scs/clusteraddon.yaml @@ -0,0 +1,21 @@ +apiVersion: clusteraddonconfig.x-k8s.io/v1alpha1 +clusterAddonVersion: clusteraddons.clusterstack.x-k8s.io/v1alpha1 +addonStages: + AfterControlPlaneInitialized: + - name: cni + action: apply + - name: metrics-server + action: apply + - name: csi + action: apply + - name: ccm + action: apply + BeforeClusterUpgrade: + - name: cni + action: apply + - name: metrics-server + action: apply + - name: csi + action: apply + - name: ccm + action: apply