Merge pull request #152 from xenit-eu/OUPSLA-53

[OUPSLA-53] add defaultBackend mapToRootOnly

.github/workflows/integration-testing.yml

@@ -1,6 +1,7 @@
 name: 'Integration testing'
 on:
   push:
+  workflow_dispatch:
 
 jobs:
   integration-testing:

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 chronology things are added/fixed/changed and - where possible - links to the PRs involved.
 
 ### Changes
+[v0.6.8]
+* Add `ingress.defaultBackend.mapToRootOnly` to make defaultBackend creation optional.
+* Add /ngnxhealth to nginx-default
+
 [XENOPS-1166]
 * add init containers to acs deployment
 * fix alfresco additionalClaims split chart

README.md

@@ -284,6 +284,14 @@ For more information take a look at
 * Default: 30000
 * Description: the default service port that ingress will point to
 
+#### `ingress.defaultBackend.mapToRootOnly`
+* Required: false
+* Default: true
+* Description: This setting (active by default) will disable the defaultBackend from the actual ingress rules and ONLY use the
+above defaultBackend settings to be mapped to the root `/` ingress rule.   
+Setting this value to `false` will activate defaultBackend ingress setting. This will create a default, hostname independent, catch-all rule. 
+This might be required if, for example on AWS, when an Internal loadbalancer is used that does not adhere to the hostname specific rules.
+
 #### `ingress.blockAcsSolrApi.enabled`
 
 * Required: false

xenit-alfresco/templates/ingress/alfresco-ingress.yaml

@@ -20,6 +20,13 @@ spec:
       # Provide a unique secret to store the SSL credentials
       secretName: tls-alfresco-{{ .Release.Name }}-secret
   {{- end }}
+  {{- if not .Values.ingress.defaultBackend.mapToRootOnly }}
+  defaultBackend:
+    service:
+      name: {{ .Values.ingress.defaultBackend.service }}
+      port:
+        number: {{ .Values.ingress.defaultBackend.port }}
+  {{- end }}
   rules:
   - host: {{ required "A host where your alfresco services can be reached on must be specified in values.ingress.host" .Values.ingress.host }}
     http:

xenit-alfresco/templates/ingress/nginx-default-config.yaml

@@ -18,6 +18,11 @@ data:
       server {
         listen 80;
         server_name _;
+        location /ngnxhealth {
+          add_header 'Content-Type' 'application/json';
+          access_log off;
+          return 200 '{"status":"UP"}';
+        }
         {{- if .Values.ingress.blockAcsSolrApi.enabled -}}
         {{- range $.Values.ingress.blockAcsSolrApi.paths }}
         location {{ . }} {

xenit-alfresco/templates/ingress/nginx-default-service.yaml

@@ -2,6 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: nginx-default-service
+  annotations:
+    alb.ingress.kubernetes.io/healthcheck-path: /ngnxhealth
   namespace: {{ .Release.Namespace | quote }}
 spec:
   {{- if .Values.general.serviceType }}

xenit-alfresco/values.yaml

@@ -24,6 +24,7 @@ ingress:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-production"
   defaultBackend:
+    mapToRootOnly: true
     service: nginx-default-service
     port: 30403
   blockAcsSolrApi: