Merge pull request #3627 from G33tha/release-5.2.0-inquiry

updated nginx config

kubernetes/helm_charts/core/nginx-public-ingress/templates/configMap.yaml

@@ -19,26 +19,4 @@ data:
   nginx.conf: |
 {{ .Values.nginxconfig | indent 4 }}
 
----
-{{- if .Values.merge_domain_status }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: keycloak-conf
-  namespace: {{ .Values.namespace }}
-data:
-  keycloak.conf: |
-{{ .Values.keycloakconf | indent 4 }}
-{{- end }}
 
----
-{{- if .Values.apple_universal_links }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: apple-universal-links
-  namespace: {{ .Values.namespace }}
-data:
-  apple-app-site-association.json: |
-{{ .Values.apple_universal_links | indent 4 }}
-{{- end }}
\ No newline at end of file

kubernetes/helm_charts/core/nginx-public-ingress/templates/daemonset.yaml

@@ -34,12 +34,7 @@ spec:
             name: proxy-default
         - name: nginx-config
           configMap:
-            name: nginx-conf
-{{- if .Values.apple_universal_links }}
-        - name: apple-site-association
-          configMap:
-            name: apple-universal-links
-{{- end }}
+            name: nginx-conf    
 {{- if .Values.volumes }}
 {{ toYaml .Values.volumes | indent 8 }}
 {{- end }}
@@ -56,11 +51,7 @@ spec:
             mountPath: /etc/nginx/defaults.d
           - name: nginx-config
             mountPath: /etc/nginx/nginx.conf
-            subPath: nginx.conf
-{{- if .Values.apple_universal_links }}
-          - name: apple-site-association
-            mountPath: /var/www/html
-{{- end }}
+            subPath: nginx.conf  
 {{- if .Values.volumeMounts }}
 {{ toYaml .Values.volumeMounts | indent 10 }}
 {{- end }}