Merge branch 'feature/custom-secret-name' into devel

charts/sddi-ckan/README.md

@@ -67,6 +67,7 @@ Kubernetes: `>= 1.23.0-0`
 | global.ingress.certManager.issuerType | string | `"namespace"` | Type of [cert-manager](https://cert-manager.io/docs/) Issuer: Use either "namespace" or "cluster". |
 | global.ingress.className | string | `"nginx"` | Name of the [IngressClass](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class) to use in Ingress routes. |
 | global.ingress.domains | list | `["localhost"]` | List of [FQDNs](https://de.wikipedia.org/wiki/Fully-Qualified_Host_Name) for this Ingress. Note: All FQDNs will be used for Ingress hosts and TLS certificate. The global setting overwrites this setting in subcharts. |
+| global.ingress.tls.secretName | string | `nil` | Specify a custom tls secret name. This my be overwritten by `ingress.tls.secretName` of subcharts. |
 | ingress-nginx.enabled | bool | `false` | Enable/disable Nginx ingress controller. |
 | nameOverride | string | `""` | Override name |
 | postgis.enabled | bool | `true` | Enable/disable database instance. Disable, if an external database is used. |

charts/sddi-ckan/charts/ckan/README.md

@@ -94,6 +94,7 @@ A Helm chart for SDDI enabled CKAN.
 | ingress.stickySessions.sessionCookie.name | string | `"route"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) |
 | ingress.stickySessions.sessionCookie.path | string | `"/"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) |
 | ingress.stickySessions.sessionCookie.secure | string | `"false"` | [Nginx Ingress Controller Sticky sessions](https://kubernetes.github.io/ingress-nginx/examples/affinity/cookie/) |
+| ingress.tls.secretName | string | `nil` | Specify a custom tls secret name. This overwrites `global.ingress.tls.secretName`. |
 | licensesGroupUrl | string | `"https://raw.githubusercontent.com/tum-gis/ckanext-grouphierarchy-sddi/main/ckanext/grouphierarchy/licenses_SDDI.json"` | [CKAN licences group url](https://docs.ckan.org/en/latest/maintaining/configuration.html#licenses-group-url): A URL pointing to a JSON file containing a list of license objects. |
 | liveness.failureThreshold | int | `6` | Failure threshold for the liveness probe |
 | liveness.initialDelaySeconds | int | `20` | Initial delay for the liveness probe |

charts/sddi-ckan/charts/ckan/templates/ckan-ingress.yml

@@ -50,7 +50,7 @@ spec:
   {{- range $domains }}
     - {{ . }}
   {{- end }}
-    secretName: tls
+    secretName: {{ (coalesce .Values.ingress.tls.secretName .Values.global.ingress.tls.secretName (printf "%s-%s" (first $domains) "tls" )) | quote }}
   rules:
   {{- range $domains }}
   - host: {{ . }}

charts/sddi-ckan/charts/ckan/values.yaml

@@ -117,6 +117,9 @@ ingress:
     # See [ingress-nginx cors settings](https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md#enable-cors)
     # for details on CORS configuration and default settings. Use `ingress.annotations` to overwrite the default configuration annotations.
     enabled: true
+  tls:
+    # -- Specify a custom tls secret name. This overwrites `global.ingress.tls.secretName`.
+    secretName:
 
 # General settings
 # -- CKAN site url. This should match a domain name of CKAN specified in `ingress.domains`/`global.ingress.domains`

charts/sddi-ckan/values.yaml

@@ -21,6 +21,9 @@ global:
       # -- Name of the Issuer to use. For certManager.type = namespace
       # `letsencrypt-staging`, `letsencrypt-production` and `self-signed` are available.
       issuerName: letsencrypt-staging
+    tls:
+      # -- Specify a custom tls secret name. This my be overwritten by `ingress.tls.secretName` of subcharts.
+      secretName:
 
   db:
     # -- Database host of the CKAN database.