Merge pull request #156 from xenit-eu/split-default-backend

split default backend and default path and rename blocked solr path to blocked paths

Author: hechmi-dammak-xenit

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.7.0]
+* rename blocked solr path to blocked paths 
+* split default backend and default path
+
 [v0.6.9]
 * solve inconsistency with mq.serviceAnnotations
 

README.md

@@ -249,7 +249,6 @@ For more information take a look at
 * Default:
   ```
   kubernetes.io/ingress.class: "nginx"
-  cert-manager.io/cluster-issuer: "letsencrypt-production"
   ```
 * Description: Annotations for ingress
 
@@ -272,34 +271,44 @@ For more information take a look at
 
 * Description: used to add more path to ingress under the same host name for new services
 
-#### `ingress.defaultBackend.service`
+#### `ingress.defaultPath.service`
 
 * Required: true
 * Default: nginx-default-service
 * Description: the default service name that ingress will point to
 
-#### `ingress.defaultBackend.port`
+#### `ingress.defaultPath.port`
 
 * Required: true
 * Default: 30000
 * Description: the default service port that ingress will point to
 
-#### `ingress.defaultBackend.mapToRootOnly`
+#### `ingress.defaultBackend.service`
+
 * 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.
+* Default: None
+* Description: Setting this value 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.defaultBackend.port`
+
+* Required: false
+* Default: None
+* Description: Setting this value 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`
+#### `ingress.blockedPaths.enabled`
 
 * Required: false
 * Default: `true`
 * Description: Enable 403 handler for alfresco api solr endpoints
 
 
-#### `ingress.blockAcsSolrApi.paths`
+#### `ingress.blockedPaths.paths`
 
 * Required: false
 * Default: 

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

@@ -20,7 +20,7 @@ spec:
       # Provide a unique secret to store the SSL credentials
       secretName: tls-alfresco-{{ .Release.Name }}-secret
   {{- end }}
-  {{- if not .Values.ingress.defaultBackend.mapToRootOnly }}
+  {{- if  .Values.ingress.defaultBackend }}
   defaultBackend:
     service:
       name: {{ .Values.ingress.defaultBackend.service }}
@@ -31,14 +31,14 @@ spec:
   - host: {{ required "A host where your alfresco services can be reached on must be specified in values.ingress.host" .Values.ingress.host }}
     http:
       paths:
-      {{- if .Values.ingress.defaultBackend }}
+      {{- if .Values.ingress.defaultPath }}
       - path: /
         pathType: Prefix
         backend:
           service:
-            name: {{ .Values.ingress.defaultBackend.service }}
+            name: {{ .Values.ingress.defaultPath.service }}
             port:
-              number: {{ .Values.ingress.defaultBackend.port }}
+              number: {{ .Values.ingress.defaultPath.port }}
       {{- end }}
       {{- if .Values.acs.ingress.enabled }}
       - path: /alfresco
@@ -76,8 +76,8 @@ spec:
             port:
               number: 30500
       {{- end }}
-      {{- if .Values.ingress.blockAcsSolrApi.enabled }}
-      {{- range .Values.ingress.blockAcsSolrApi.paths }}
+      {{- if .Values.ingress.blockedPaths.enabled }}
+      {{- range .Values.ingress.blockedPaths.paths }}
       - path: {{ . }}
         pathType: Prefix
         backend:

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

@@ -23,8 +23,8 @@ data:
           access_log off;
           return 200 '{"status":"UP"}';
         }
-        {{- if .Values.ingress.blockAcsSolrApi.enabled -}}
-        {{- range $.Values.ingress.blockAcsSolrApi.paths }}
+        {{- if .Values.ingress.blockedPaths.enabled -}}
+        {{- range $.Values.ingress.blockedPaths.paths }}
         location {{ . }} {
           return 403 'Forbidden';
         }

xenit-alfresco/values.yaml

@@ -22,12 +22,10 @@ ingress:
   protocol: 'https'
   ingressAnnotations:
     kubernetes.io/ingress.class: "nginx"
-    cert-manager.io/cluster-issuer: "letsencrypt-production"
-  defaultBackend:
-    mapToRootOnly: true
+  defaultPath:
     service: nginx-default-service
     port: 30403
-  blockAcsSolrApi:
+  blockedPaths:
     enabled: true
     paths:
       - /alfresco/s/api/solr