From a7873c904fc90e365ee5f0d4a1b59cf40b3e8082 Mon Sep 17 00:00:00 2001 From: scrungus Date: Fri, 5 May 2023 17:52:32 +0100 Subject: [PATCH 1/5] change default --- charts/openstack-cluster/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/openstack-cluster/values.yaml b/charts/openstack-cluster/values.yaml index 3ace705..d8a3dc9 100644 --- a/charts/openstack-cluster/values.yaml +++ b/charts/openstack-cluster/values.yaml @@ -103,8 +103,9 @@ additionalPackages: [] apiServer: # Indicates whether to deploy a load balancer for the API server enableLoadBalancer: true - # Indicates what loadbalancer provider to use - loadBalancerProvider: ovn + # Indicates what loadbalancer provider to use. Default is amphora + #loadBalancerProvider: + # Indicates whether to associate a floating IP with the API server associateFloatingIP: true # The specific floating IP to associate with the API server From e5c58923e6c94aaf727283c99ed602121d72dc1a Mon Sep 17 00:00:00 2001 From: scrungus Date: Fri, 5 May 2023 17:55:50 +0100 Subject: [PATCH 2/5] add if block --- charts/openstack-cluster/templates/cluster-openstack.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/openstack-cluster/templates/cluster-openstack.yaml b/charts/openstack-cluster/templates/cluster-openstack.yaml index dab09af..f75ae54 100644 --- a/charts/openstack-cluster/templates/cluster-openstack.yaml +++ b/charts/openstack-cluster/templates/cluster-openstack.yaml @@ -43,8 +43,10 @@ spec: {{- if .enableLoadBalancer }} apiServerLoadBalancer: enabled: true + {{ - if .loadBalancerProvider }} provider: {{ .loadBalancerProvider }} {{- end }} + {{- end }} disableAPIServerFloatingIP: {{ not .associateFloatingIP }} {{- with .floatingIP }} From 3fb7b4d9967c8a3f6b50cb4b6af01c3ffa77a2d0 Mon Sep 17 00:00:00 2001 From: scrungus Date: Fri, 5 May 2023 17:58:03 +0100 Subject: [PATCH 3/5] fix linting errors --- charts/openstack-cluster/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/openstack-cluster/values.yaml b/charts/openstack-cluster/values.yaml index d8a3dc9..c9c05f0 100644 --- a/charts/openstack-cluster/values.yaml +++ b/charts/openstack-cluster/values.yaml @@ -104,8 +104,8 @@ apiServer: # Indicates whether to deploy a load balancer for the API server enableLoadBalancer: true # Indicates what loadbalancer provider to use. Default is amphora - #loadBalancerProvider: - + loadBalancerProvider: nil + # Indicates whether to associate a floating IP with the API server associateFloatingIP: true # The specific floating IP to associate with the API server From 2bd5526de509f591ce7c57012b79021da7686c61 Mon Sep 17 00:00:00 2001 From: scrungus Date: Fri, 5 May 2023 17:59:43 +0100 Subject: [PATCH 4/5] fix linting errors --- charts/openstack-cluster/templates/cluster-openstack.yaml | 2 +- charts/openstack-cluster/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/openstack-cluster/templates/cluster-openstack.yaml b/charts/openstack-cluster/templates/cluster-openstack.yaml index f75ae54..d4afda9 100644 --- a/charts/openstack-cluster/templates/cluster-openstack.yaml +++ b/charts/openstack-cluster/templates/cluster-openstack.yaml @@ -43,7 +43,7 @@ spec: {{- if .enableLoadBalancer }} apiServerLoadBalancer: enabled: true - {{ - if .loadBalancerProvider }} + {{- if .loadBalancerProvider }} provider: {{ .loadBalancerProvider }} {{- end }} {{- end }} diff --git a/charts/openstack-cluster/values.yaml b/charts/openstack-cluster/values.yaml index c9c05f0..66a4b11 100644 --- a/charts/openstack-cluster/values.yaml +++ b/charts/openstack-cluster/values.yaml @@ -104,7 +104,7 @@ apiServer: # Indicates whether to deploy a load balancer for the API server enableLoadBalancer: true # Indicates what loadbalancer provider to use. Default is amphora - loadBalancerProvider: nil + loadBalancerProvider: # Indicates whether to associate a floating IP with the API server associateFloatingIP: true From 5e87d56692a67f7c34d7ef0fba2d97499a0b4df7 Mon Sep 17 00:00:00 2001 From: scrungus Date: Fri, 5 May 2023 18:01:25 +0100 Subject: [PATCH 5/5] fix linting errors --- charts/openstack-cluster/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openstack-cluster/values.yaml b/charts/openstack-cluster/values.yaml index 66a4b11..0c162f9 100644 --- a/charts/openstack-cluster/values.yaml +++ b/charts/openstack-cluster/values.yaml @@ -104,7 +104,7 @@ apiServer: # Indicates whether to deploy a load balancer for the API server enableLoadBalancer: true # Indicates what loadbalancer provider to use. Default is amphora - loadBalancerProvider: + loadBalancerProvider: # Indicates whether to associate a floating IP with the API server associateFloatingIP: true