Fix remaining tls (#38)

* add ingress changes to remaining svcs * bump version for release
mojaloop · Jan 14, 2022 · 14b410e · 14b410e
1 parent 429032d
commit 14b410e
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 1 deletion.
diff --git a/mojaloop/bof/Chart.yaml b/mojaloop/bof/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.10
+version: 1.0.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/mojaloop/reporting-hub-bop-api-svc/templates/ingress.yaml b/mojaloop/reporting-hub-bop-api-svc/templates/ingress.yaml
@@ -53,7 +53,14 @@ spec:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+        {{- if .Values.ingress.tlsWildcardName }}
+        - {{ printf "*.%s" .Values.ingress.tlsWildcardName | quote }}
+        {{- end }}
+      {{- if .Values.ingress.tlsSetSecretManual }}
+      secretName: {{ .Values.ingress.tlsManualSecretName }}
+      {{- else }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}

diff --git a/mojaloop/reporting-hub-bop-api-svc/values.yaml b/mojaloop/reporting-hub-bop-api-svc/values.yaml
@@ -279,8 +279,19 @@ ingress:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
+  ##   - use `ingress.tlsManualSecretName=<secretname>` to set the tls secretname to the desired value if ingress.tlsSetSecretManual is true
+  ##   - To add wildcard to tls, use `ingress.tlsWildcardName`
   ##
   tls: false
+  ## @param ingress.tlsSetSecretManual configure tlssecret manually
+  ##
+  tlsSetSecretManual: false
+  ## @param ingress.tlsManualSecretName Use a TLS secret named this value if tlsSetSecretManual is true
+  ##
+  tlsManualSecretName: null
+  ## @param ingress.tlsWildcardName - add wildcard name to tls hosts
+  ##
+  tlsWildcardName: null
   ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
   ##
   certManager: false

diff --git a/mojaloop/reporting-hub-bop-positions-ui/templates/ingress.yaml b/mojaloop/reporting-hub-bop-positions-ui/templates/ingress.yaml
@@ -53,7 +53,14 @@ spec:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+        {{- if .Values.ingress.tlsWildcardName }}
+        - {{ printf "*.%s" .Values.ingress.tlsWildcardName | quote }}
+        {{- end }}
+      {{- if .Values.ingress.tlsSetSecretManual }}
+      secretName: {{ .Values.ingress.tlsManualSecretName }}
+      {{- else }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}

diff --git a/mojaloop/reporting-hub-bop-positions-ui/values.yaml b/mojaloop/reporting-hub-bop-positions-ui/values.yaml
@@ -258,8 +258,19 @@ ingress:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
+  ##   - use `ingress.tlsManualSecretName=<secretname>` to set the tls secretname to the desired value if ingress.tlsSetSecretManual is true
+  ##   - To add wildcard to tls, use `ingress.tlsWildcardName`
   ##
   tls: false
+  ## @param ingress.tlsSetSecretManual configure tlssecret manually
+  ##
+  tlsSetSecretManual: false
+  ## @param ingress.tlsManualSecretName Use a TLS secret named this value if tlsSetSecretManual is true
+  ##
+  tlsManualSecretName: null
+  ## @param ingress.tlsWildcardName - add wildcard name to tls hosts
+  ##
+  tlsWildcardName: null
   ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
   ##
   certManager: false

diff --git a/mojaloop/reporting-hub-bop-settlements-ui/templates/ingress.yaml b/mojaloop/reporting-hub-bop-settlements-ui/templates/ingress.yaml
@@ -53,7 +53,14 @@ spec:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+        {{- if .Values.ingress.tlsWildcardName }}
+        - {{ printf "*.%s" .Values.ingress.tlsWildcardName | quote }}
+        {{- end }}
+      {{- if .Values.ingress.tlsSetSecretManual }}
+      secretName: {{ .Values.ingress.tlsManualSecretName }}
+      {{- else }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}

diff --git a/mojaloop/reporting-hub-bop-settlements-ui/values.yaml b/mojaloop/reporting-hub-bop-settlements-ui/values.yaml
@@ -260,8 +260,19 @@ ingress:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
+  ##   - use `ingress.tlsManualSecretName=<secretname>` to set the tls secretname to the desired value if ingress.tlsSetSecretManual is true
+  ##   - To add wildcard to tls, use `ingress.tlsWildcardName`
   ##
   tls: false
+  ## @param ingress.tlsSetSecretManual configure tlssecret manually
+  ##
+  tlsSetSecretManual: false
+  ## @param ingress.tlsManualSecretName Use a TLS secret named this value if tlsSetSecretManual is true
+  ##
+  tlsManualSecretName: null
+  ## @param ingress.tlsWildcardName - add wildcard name to tls hosts
+  ##
+  tlsWildcardName: null
   ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
   ##
   certManager: false

diff --git a/mojaloop/reporting-hub-bop-trx-ui/templates/ingress.yaml b/mojaloop/reporting-hub-bop-trx-ui/templates/ingress.yaml
@@ -53,7 +53,14 @@ spec:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+        {{- if .Values.ingress.tlsWildcardName }}
+        - {{ printf "*.%s" .Values.ingress.tlsWildcardName | quote }}
+        {{- end }}
+      {{- if .Values.ingress.tlsSetSecretManual }}
+      secretName: {{ .Values.ingress.tlsManualSecretName }}
+      {{- else }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}

diff --git a/mojaloop/reporting-hub-bop-trx-ui/values.yaml b/mojaloop/reporting-hub-bop-trx-ui/values.yaml
@@ -259,8 +259,19 @@ ingress:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
+  ##   - use `ingress.tlsManualSecretName=<secretname>` to set the tls secretname to the desired value if ingress.tlsSetSecretManual is true
+  ##   - To add wildcard to tls, use `ingress.tlsWildcardName`
   ##
   tls: false
+  ## @param ingress.tlsSetSecretManual configure tlssecret manually
+  ##
+  tlsSetSecretManual: false
+  ## @param ingress.tlsManualSecretName Use a TLS secret named this value if tlsSetSecretManual is true
+  ##
+  tlsManualSecretName: null
+  ## @param ingress.tlsWildcardName - add wildcard name to tls hosts
+  ##
+  tlsWildcardName: null
   ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
   ##
   certManager: false

diff --git a/mojaloop/reporting-legacy-api/templates/ingress.yaml b/mojaloop/reporting-legacy-api/templates/ingress.yaml
@@ -53,7 +53,14 @@ spec:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+        {{- if .Values.ingress.tlsWildcardName }}
+        - {{ printf "*.%s" .Values.ingress.tlsWildcardName | quote }}
+        {{- end }}
+      {{- if .Values.ingress.tlsSetSecretManual }}
+      secretName: {{ .Values.ingress.tlsManualSecretName }}
+      {{- else }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}

diff --git a/mojaloop/reporting-legacy-api/values.yaml b/mojaloop/reporting-legacy-api/values.yaml
@@ -261,8 +261,19 @@ ingress:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
+  ##   - use `ingress.tlsManualSecretName=<secretname>` to set the tls secretname to the desired value if ingress.tlsSetSecretManual is true
+  ##   - To add wildcard to tls, use `ingress.tlsWildcardName`
   ##
   tls: false
+  ## @param ingress.tlsSetSecretManual configure tlssecret manually
+  ##
+  tlsSetSecretManual: false
+  ## @param ingress.tlsManualSecretName Use a TLS secret named this value if tlsSetSecretManual is true
+  ##
+  tlsManualSecretName: null
+  ## @param ingress.tlsWildcardName - add wildcard name to tls hosts
+  ##
+  tlsWildcardName: null
   ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
   ##
   certManager: false

diff --git a/mojaloop/role-assignment-service/templates/ingress.yaml b/mojaloop/role-assignment-service/templates/ingress.yaml
@@ -53,7 +53,14 @@ spec:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+        {{- if .Values.ingress.tlsWildcardName }}
+        - {{ printf "*.%s" .Values.ingress.tlsWildcardName | quote }}
+        {{- end }}
+      {{- if .Values.ingress.tlsSetSecretManual }}
+      secretName: {{ .Values.ingress.tlsManualSecretName }}
+      {{- else }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}

diff --git a/mojaloop/role-assignment-service/values.yaml b/mojaloop/role-assignment-service/values.yaml
@@ -266,8 +266,19 @@ ingress:
   ##   - Use the `ingress.secrets` parameter to create this TLS secret
   ##   - Relay on cert-manager to create it by setting `ingress.certManager=true`
   ##   - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true`
+  ##   - use `ingress.tlsManualSecretName=<secretname>` to set the tls secretname to the desired value if ingress.tlsSetSecretManual is true
+  ##   - To add wildcard to tls, use `ingress.tlsWildcardName`
   ##
   tls: false
+  ## @param ingress.tlsSetSecretManual configure tlssecret manually
+  ##
+  tlsSetSecretManual: false
+  ## @param ingress.tlsManualSecretName Use a TLS secret named this value if tlsSetSecretManual is true
+  ##
+  tlsManualSecretName: null
+  ## @param ingress.tlsWildcardName - add wildcard name to tls hosts
+  ##
+  tlsWildcardName: null
   ## @param ingress.certManager Add the corresponding annotations for cert-manager integration
   ##
   certManager: false