Merge pull request #1 from SovereignCloudStack/yawol

Updates for yawol LoadBalancer

Author: Malte Münch

Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: csp-helper-chart
 description: A Helm chart to deploy SCS cluster-api-provider-v2 per-tenant resources
-version: 0.2.0
-appVersion: "0.2.0"
+version: 0.4.0
+appVersion: "0.4.0"

README.md

@@ -1,7 +1,7 @@
-# openstack-csp-helper
-
 This chart can be used to create a new namespace and two secrets for the clusterstacks approach. It reads clouds.yaml files in its raw form either with username and password or with an application credential. The chart is intended to be used once per Openstack-Project/Tenant. It is meant to prepare one corresponding namespace in the cluster-API management cluster (1:1 relation between openstackproject and cluster-namespace). The recommended way to invoke the chart is:
 
 ```
-helm upgrade -i <tenant>-credentials -n <tenant> --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/download/v0.3.0/v0.3.0.tgz -f clouds.yaml
+helm upgrade -i <tenant>-credentials -n <tenant> --create-namespace https://github.com/SovereignCloudStack/openstack-csp-helper/releases/latest/download/openstack-csp-helper.tgz -f clouds.yaml
 ```
+
+If using the Wooctavia cluster stack, add `--set yawol=true` to the helm command.

templates/_helpers.tpl

@@ -36,6 +36,10 @@ Checks whether we have a regular clouds.yaml or one with application credentials
 {{ get (get (get .Values.clouds (include "cloud_name" .)) "auth") "user_domain_name" }}
 {{- end }}
 
+{{- define "auth_domain_name" -}}
+{{ get (get (get .Values.clouds (include "cloud_name" .)) "auth") "domain_name" }}
+{{- end }}
+
 {{- define "auth_application_credential_id" -}}
 {{ get (get (get .Values.clouds (include "cloud_name" .)) "auth") "application_credential_id" }}
 {{- end }}
@@ -49,12 +53,12 @@ Checks whether we have a regular clouds.yaml or one with application credentials
 {{- end }}
 
 {{- define "isAppCredential" -}}
-{{- if and 
-    ( include "auth_username" .) 
+{{- if and
+    ( include "auth_username" .)
     (not ( include "auth_application_credential_id" . ))
 -}}
-{{- else if and 
-    ( not ( include "auth_username" . )) 
+{{- else if and
+    ( not ( include "auth_username" . ))
     ( include "auth_application_credential_id" . )
 -}}
 true
@@ -77,12 +81,14 @@ application-credential-secret={{ include "auth_application_credential_secret" .
 username={{ include "auth_username" . }}
 password={{ include "auth_password" . }}
 user-domain-name={{ include "auth_user_domain_name" . }}
+domain-name={{ default (include "auth_user_domain_name" .) (include "auth_domain_name" .) }}
 tenant-id={{ include "auth_project_id" . }}
+project-id={{ include "auth_project_id" . }}
 {{ end }}
 
 [LoadBalancer]
+enabled={{ not (.Values.yawol | default false) }}
 manage-security-groups=true
-use-octavia=true
 enable-ingress-hostname=true
 create-monitor=true
 {{- end }}
@@ -96,6 +102,9 @@ Templates the secret that contains cloud.conf as needed by the openstack CCM
 apiVersion: v1
 data:
   cloud.conf: {{ include "cloud.conf" . | b64enc }}
+{{- if .Values.yawol }}
+  cloudprovider.conf: {{ include "cloud.conf" . | b64enc }}
+{{- end }}
 kind: Secret
 metadata:
   name: cloud-config