From cbb93875a1c8b3ac30f2fd2f91734fc23e3479e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20M=C3=BCnch?= Date: Thu, 1 Feb 2024 10:23:50 +0100 Subject: [PATCH] Adds parameters for server_group_id (#17) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One parameter for the worker nodes and one for the controller nodes. With this parameter. All values that have been used in k8s-cluster-api-provider can now be set via helm. Signed-off-by: Malte Münch --- .../templates/openstack-machine-template-control-plane.yaml | 6 ++++-- .../templates/openstack-machine-template-worker.yaml | 4 +++- providers/openstack/scs/1-27/cluster-class/values.yaml | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml b/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml index ae4f2c84..0f3cb183 100644 --- a/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml +++ b/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-control-plane.yaml @@ -22,5 +22,7 @@ spec: - name: {{ .Values.prefix }}-allow-icmp - name: {{ .Values.prefix }}-{{ .Values.testcluster_name }}-cilium {{- end}} - # serverGroupID left blank for now - sshKeyName: {{ .Values.prefix }}-keypair \ No newline at end of file +{{- if .Values.server_group_id_controller }} + serverGroupID: {{ .Values.server_group_id_controller }} +{{- end}} + sshKeyName: {{ .Values.prefix }}-keypair diff --git a/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-worker.yaml index 455d712f..1dd9a715 100644 --- a/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/openstack/scs/1-27/cluster-class/templates/openstack-machine-template-worker.yaml @@ -22,6 +22,8 @@ spec: - name: {{ .Values.prefix }}-allow-icmp - name: {{ .Values.prefix }}-{{ .Values.testcluster_name }}-cilium {{- end}} - # serverGroupID left blank for now +{{- if .Values.server_group_id_worker }} + serverGroupID: {{ .Values.server_group_id_worker }} +{{- end}} sshKeyName: {{ .Values.prefix }}-keypair diff --git a/providers/openstack/scs/1-27/cluster-class/values.yaml b/providers/openstack/scs/1-27/cluster-class/values.yaml index 5e987b5b..81dd6c38 100644 --- a/providers/openstack/scs/1-27/cluster-class/values.yaml +++ b/providers/openstack/scs/1-27/cluster-class/values.yaml @@ -21,6 +21,8 @@ tweak_kubeapi_memlimit: true worker_machine_gen: genw01 control_plane_machine_gen: genc01 openstack_security_groups: [] +server_group_id_controller: "" +server_group_id_worker: "" # TBD, currently needed: images: