refactor: remove separated ingress functionality (#2586)

BREAKING CHANGE: remove separated ingress functionality and only keep the global combined ingress

Release-As: 0.0.0-8.7.0-alpha2

charts/camunda-platform-alpha/templates/NOTES.txt

@@ -77,7 +77,6 @@ Now you can connect your workers and clients to `localhost:26500`
 
 
 As part of the Helm charts, an ingress definition can be deployed, but you require to have an Ingress Controller for that Ingress to be Exposed.
-In order to deploy the ingress manifest, set `<service>.ingress.enabled` to `true`. Example: `operate.ingress.enabled=true`
 
 If you don't have an ingress controller you can use `kubectl port-forward` to access the deployed web application from outside the cluster:
 
@@ -111,7 +110,7 @@ as well, otherwise, a login will not be possible. Make sure you use `18080` as a
 {{- end }}
 {{- end }}
 
-Now you can point your browser to one of the service's login pages. Example: http://localhost:8081 for Operate.
+Now you can point your browser to one of the service's login pages.
 {{ if .Values.identity.firstUser.enabled }}
 {{- if .Values.identity.firstUser.existingSecret }}
 Default user: "{{ .Values.identity.firstUser.username }}", and for password, run:
@@ -145,12 +144,12 @@ Default user and password: "{{ .Values.identity.firstUser.username -}}/{{ .Value
 {{- end }}
 
 {{- if .Values.core.ingress.grpc.enabled }}
-- Zeebe Gateway gRPC: {{  include "camundaPlatform.zeebeGatewayGRPCExternalURL" . }}
+- Camunda gRPC API: {{  include "camundaPlatform.zeebeGatewayGRPCExternalURL" . }}
 {{- end }}
 
 {{- if .Values.core.ingress.http.enabled }}
 {{ $proto := ternary "https" "http" .Values.core.ingress.http.tls.enabled -}}
-- Zeebe Gateway REST: {{ $proto }}://{{ tpl .Values.core.ingress.http.host $ }}
+- Camunda REST API: {{ $proto }}://{{ tpl .Values.core.ingress.http.host $ }}
 {{- end }}
 
 {{ if .Values.global.createReleaseInfo -}}

charts/camunda-platform-alpha/templates/camunda/_helpers.tpl

@@ -362,10 +362,7 @@ Usage: {{ include "camundaPlatform.getExternalURL" (dict "component" "operate" "
 */}}
 {{- define "camundaPlatform.getExternalURL" -}}
   {{- if (index .context.Values .component "enabled") -}}
-    {{- if (index .context.Values .component "ingress" "enabled") }}
-      {{- $proto := ternary "https" "http" (index .context.Values .component "ingress" "tls" "enabled") -}}
-      {{- printf "%s://%s" $proto (index .context.Values .component "ingress" "host") -}}
-    {{- else if $.context.Values.global.ingress.enabled -}}
+    {{- if $.context.Values.global.ingress.enabled -}}
       {{ $proto := ternary "https" "http" .context.Values.global.ingress.tls.enabled -}}
       {{- printf "%s://%s%s" $proto .context.Values.global.ingress.host (index .context.Values .component "contextPath") -}}
     {{- else -}}
@@ -455,11 +452,7 @@ Web Modeler templates.
 
 {{- define "camundaPlatform.getExternalURLModeler" -}}
   {{- if .context.Values.webModeler.enabled -}}
-    {{- $ingress := .context.Values.webModeler.ingress }}
-    {{- if index $ingress "enabled" }}
-      {{- $proto := ternary "https" "http" (index $ingress .component "tls" "enabled") -}}
-      {{- printf "%s://%s" $proto (index $ingress .component "host") -}}
-    {{- else if $.context.Values.global.ingress.enabled -}}
+    {{- if $.context.Values.global.ingress.enabled -}}
       {{ $proto := ternary "https" "http" .context.Values.global.ingress.tls.enabled -}}
       {{- if eq .component "websockets" }}
         {{- printf "%s://%s%s" $proto .context.Values.global.ingress.host (include "webModeler.websocketContextPath" .context) -}}

charts/camunda-platform-alpha/templates/camunda/ingress-http.yaml

@@ -26,7 +26,7 @@ spec:
                 port:
                   number: {{ .Values.console.service.port }}
             path: {{ .Values.console.contextPath }}
-            pathType: {{ .Values.console.ingress.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           {{- end }}
           {{- if .Values.identity.enabled }}
           {{- if or .Values.identityKeycloak.enabled .Values.global.identity.keycloak.internal }}
@@ -39,14 +39,14 @@ spec:
             pathType: {{ .Values.identityKeycloak.ingress.pathType | default .Values.global.ingress.pathType }}
           {{- end }}
           {{- /* Disable Identiy endpoint if a seperated Ingress is used because it overlaps with Keycloak endpoints */ -}}
-          {{- if and .Values.identity.contextPath (not .Values.identity.ingress.enabled) }}
+          {{- if .Values.identity.contextPath }}
           - backend:
               service:
                 name: {{ template "identity.fullname" . }}
                 port:
                   number: {{ .Values.identity.service.port }}
             path: {{ .Values.identity.contextPath }}
-            pathType: {{ .Values.identity.ingress.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           {{- end }}
           {{- end }}
           {{- if and .Values.webModeler.enabled .Values.webModeler.contextPath }}
@@ -56,14 +56,14 @@ spec:
                 port:
                   number: {{ .Values.webModeler.webapp.service.port }}
             path: {{ .Values.webModeler.contextPath }}
-            pathType: {{ .Values.webModeler.ingress.webapp.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           - backend:
               service:
                 name: {{ template "webModeler.websockets.fullname" . }}
                 port:
                   number:  {{ .Values.webModeler.websockets.service.port }}
             path: {{ template "webModeler.websocketContextPath" . }}
-            pathType: {{ .Values.webModeler.ingress.websockets.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           {{- end }}
         {{- /* Orchestration Group */ -}}
           {{- if and .Values.core.enabled .Values.core.contextPath }}
@@ -74,15 +74,15 @@ spec:
                 port:
                   number: {{ .Values.core.service.httpPort }}
             path: {{ .Values.core.contextPath }}
-            pathType: {{ .Values.core.ingress.http.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           # Core - Optimize.
           - backend:
               service:
                 name: {{ template "optimize.fullname" . }}
                 port:
                   number: {{ .Values.optimize.service.port }}
             path: {{ .Values.optimize.contextPath }}
-            pathType: {{ .Values.optimize.ingress.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           {{- end }}
           {{- if and .Values.connectors.enabled .Values.connectors.contextPath }}
           # Connectors.
@@ -92,7 +92,7 @@ spec:
                 port:
                   number: {{ .Values.connectors.service.serverPort }}
             path: {{ .Values.connectors.contextPath }}
-            pathType: {{ .Values.connectors.ingress.pathType | default .Values.global.ingress.pathType }}
+            pathType: {{ .Values.global.ingress.pathType }}
           {{- end }}
   {{- if .Values.global.ingress.tls.enabled }}
   tls:

charts/camunda-platform-alpha/templates/identity/_helpers.tpl

@@ -32,10 +32,6 @@ Create a default fully qualified app name.
             {{- $host := .Values.global.ingress.host -}}
             {{- $path := .Values.identity.contextPath | default "" -}}
             {{- printf "%s://%s%s" $proto $host $path -}}
-        {{- else if .Values.identity.ingress.enabled -}}
-            {{- $proto := ternary "https" "http" .Values.identity.ingress.tls.enabled -}}
-            {{- $host := .Values.identity.ingress.host -}}
-            {{- printf "%s://%s" $proto $host -}}
         {{- else -}}
             {{- "http://localhost:8080" -}}
         {{- end -}}

charts/camunda-platform-alpha/templates/web-modeler/_helpers.tpl

@@ -305,8 +305,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
 {{- define "webModeler.publicWebsocketHost" -}}
   {{- if and .Values.global.ingress.enabled .Values.webModeler.contextPath }}
     {{- .Values.global.ingress.host }}
-  {{- else }}
-    {{- .Values.webModeler.ingress.enabled | ternary .Values.webModeler.ingress.websockets.host .Values.webModeler.websockets.publicHost }}
   {{- end }}
 {{- end -}}
 
@@ -317,11 +315,7 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
   {{- if and .Values.global.ingress.enabled .Values.webModeler.contextPath }}
     {{- .Values.global.ingress.tls.enabled | ternary "443" "80" }}
   {{- else }}
-    {{- if .Values.webModeler.ingress.enabled }}
-      {{- .Values.webModeler.ingress.websockets.tls.enabled | ternary "443" "80" }}
-    {{- else }}
-      {{- .Values.webModeler.websockets.publicPort }}
-    {{- end }}
+    {{- .Values.webModeler.websockets.publicPort }}
   {{- end }}
 {{- end -}}
 
@@ -331,8 +325,6 @@ Define match labels for Web Modeler websockets to be used in matchLabels selecto
 {{- define "webModeler.websocketTlsEnabled" -}}
   {{- if and .Values.global.ingress.enabled .Values.webModeler.contextPath }}
     {{- .Values.global.ingress.tls.enabled }}
-  {{- else }}
-    {{- and .Values.webModeler.ingress.enabled .Values.webModeler.ingress.websockets.tls.enabled }}
   {{- end }}
 {{- end -}}