From fce77729140e316f7aec109c65466364be042437 Mon Sep 17 00:00:00 2001 From: "michal.gubricky" Date: Thu, 18 Jul 2024 15:26:21 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Remove=20unnecessary=20default=20values=20?= =?UTF-8?q?=E2=80=8B=E2=80=8Bfrom=20OpenStackClusterTemplate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: michal.gubricky --- .../cluster-class/templates/openstack-cluster-template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml b/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml index 040fd6c4..58977526 100644 --- a/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml +++ b/providers/openstack/scs/cluster-class/templates/openstack-cluster-template.yaml @@ -6,8 +6,8 @@ spec: template: spec: identityRef: - cloudName: {{ default "openstack" .Values.identityRef.cloudName }} - name: {{ default "openstack" .Values.identityRef.name }} + cloudName: {{ .Values.identityRef.cloudName }} + name: {{ .Values.identityRef.name }} apiServerLoadBalancer: enabled: {{ .Values.openstack_loadbalancer_apiserver }} {{- if .Values.restrict_kubeapi }} From f04914e3990c2fdada5cc91db9eeffbf14681a67 Mon Sep 17 00:00:00 2001 From: "michal.gubricky" Date: Thu, 18 Jul 2024 15:40:49 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Remove=20unnecessary=20default=20values=20?= =?UTF-8?q?=E2=80=8B=E2=80=8Bfrom=20OpenStackMachineTemplates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: michal.gubricky --- .../templates/openstack-machine-template-control-plane.yaml | 4 ++-- .../templates/openstack-machine-template-worker.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/openstack/scs/cluster-class/templates/openstack-machine-template-control-plane.yaml b/providers/openstack/scs/cluster-class/templates/openstack-machine-template-control-plane.yaml index 8c45df48..d2acdd7d 100644 --- a/providers/openstack/scs/cluster-class/templates/openstack-machine-template-control-plane.yaml +++ b/providers/openstack/scs/cluster-class/templates/openstack-machine-template-control-plane.yaml @@ -7,8 +7,8 @@ spec: spec: flavor: {{ .Values.controller_flavor }} identityRef: - cloudName: {{ default "openstack" .Values.identityRef.cloudName }} - name: {{ default "openstack" .Values.identityRef.name }} + cloudName: {{ .Values.identityRef.cloudName }} + name: {{ .Values.identityRef.name }} image: filter: name: {{ .Values.images.controlPlane.name }} diff --git a/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml index 8efd8b5c..83deb117 100644 --- a/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml @@ -7,8 +7,8 @@ spec: spec: flavor: {{ .Values.worker_flavor }} identityRef: - cloudName: {{ default "openstack" .Values.identityRef.cloudName }} - name: {{ default "openstack" .Values.identityRef.name }} + cloudName: {{ .Values.identityRef.cloudName }} + name: {{ .Values.identityRef.name }} image: filter: name: {{ .Values.images.worker.name }}