From fde939718454202ea49d6dea171c70bace37c044 Mon Sep 17 00:00:00 2001
From: Luis Schweigard <luis.schweigard@gmail.com>
Date: Wed, 22 Jan 2025 14:21:26 +0100
Subject: [PATCH] Hotfixes for ingress and artifact registry

---
 local/kubernetes/tools/istio/kiali.yaml                     | 2 +-
 stack/application/frontend/nginx/dima.conf.template         | 2 +-
 stack/kubernetes/24_deploy_logging.sh                       | 6 +++++-
 .../application/charts/frontend/templates/ingress.yaml      | 2 +-
 .../application/charts/imageflip/templates/ingress.yaml     | 2 +-
 .../charts/imagegrayscale/templates/ingress.yaml            | 2 +-
 .../application/charts/imageholder/templates/ingress.yaml   | 2 +-
 .../charts/imageorchestrator/templates/ingress.yaml         | 2 +-
 .../application/charts/imageresize/templates/ingress.yaml   | 2 +-
 .../application/charts/imagerotator/templates/ingress.yaml  | 2 +-
 .../charts/imagethumbnail/templates/ingress.yaml            | 2 +-
 .../application/charts/trafficgen/templates/ingress.yaml    | 2 +-
 stack/kubernetes/tools/ingress/jaeger-ingress.yaml          | 2 +-
 stack/kubernetes/tools/istio/kiali.yaml                     | 2 +-
 stack/kubernetes/tools/logging/kibana.yaml                  | 2 +-
 15 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/local/kubernetes/tools/istio/kiali.yaml b/local/kubernetes/tools/istio/kiali.yaml
index 80423948..03a9534f 100644
--- a/local/kubernetes/tools/istio/kiali.yaml
+++ b/local/kubernetes/tools/istio/kiali.yaml
@@ -20,7 +20,7 @@ deployment:
                       name: kiali
                       port:
                         number: 20001
-                  path: /(.*)
+                  path: /
                   pathType: Prefix
   pod_annotations:
     prometheus.io/scrape: "true"
diff --git a/stack/application/frontend/nginx/dima.conf.template b/stack/application/frontend/nginx/dima.conf.template
index 0fd75bdd..af9f5035 100644
--- a/stack/application/frontend/nginx/dima.conf.template
+++ b/stack/application/frontend/nginx/dima.conf.template
@@ -37,7 +37,7 @@ http {
     }
 
     # generic backend service proxy
-    location ~ ^/proxy/([^\/\?]+)\/(.*) {
+    location ~ ^/proxy/([^\/\?]+)\/ {
       proxy_pass http://dima-$1-service.${SVC_NAMESPACE}.svc.cluster.local:8080/$2?$args;
       opentracing_propagate_context;
       proxy_set_header X-Real-IP $remote_addr;
diff --git a/stack/kubernetes/24_deploy_logging.sh b/stack/kubernetes/24_deploy_logging.sh
index c48564ac..41f63215 100755
--- a/stack/kubernetes/24_deploy_logging.sh
+++ b/stack/kubernetes/24_deploy_logging.sh
@@ -39,4 +39,8 @@ helm upgrade --install -n "$NAMESPACE" --version ${ELASTIC_VERSION} apm-server e
 # kubectl apply -f tools/logging/heartbeat-v7.17.yaml
 
 echo "--- apply kibana index mappings and patterns"
-./tools/logging/kibana-index/build_deploy.sh "$NAMESPACE"
\ No newline at end of file
+
+# Might require:
+# gcloud auth configure-docker gcr.io
+./tools/logging/kibana-index/build_deploy.sh "$NAMESPACE"
+
diff --git a/stack/kubernetes/application/charts/frontend/templates/ingress.yaml b/stack/kubernetes/application/charts/frontend/templates/ingress.yaml
index 58aef13e..52541f48 100644
--- a/stack/kubernetes/application/charts/frontend/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/frontend/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ .Release.Name }}-{{ .Chart.Name }}-service
                 port:
                   number: 80
-            path: /(.*)
+            path: /
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml b/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml
index ee6ca3dc..d0e91d49 100644
--- a/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imageflip.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imageflip/(.*)
+            path: /proxy/imageflip/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml b/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml
index 950aa0a2..305f5502 100644
--- a/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imagegrayscale.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imagegrayscale/(.*)
+            path: /proxy/imagegrayscale/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml b/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml
index 949af14e..b9b02df3 100644
--- a/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imageholder.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imageholder/(.*)
+            path: /proxy/imageholder/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml b/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml
index 5b9b757a..b4d50a1e 100644
--- a/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imageorchestrator.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imageorchestrator/(.*)
+            path: /proxy/imageorchestrator/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml b/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml
index 7342f60f..50a2d394 100644
--- a/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imageresize.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imageresize/(.*)
+            path: /proxy/imageresize/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml b/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml
index a8b2fe5b..39fe364a 100644
--- a/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imagerotator.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imagerotator/(.*)
+            path: /proxy/imagerotator/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml b/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml
index 2e58ddde..803292d9 100644
--- a/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-imagethumbnail.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/imagethumbnail/(.*)
+            path: /proxy/imagethumbnail/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml b/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml
index 7ac3619f..37821ca3 100644
--- a/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml
@@ -21,7 +21,7 @@ spec:
                 name: {{ template "dima-trafficgen.service.name" . }}
                 port:
                   number: 8080
-            path: /proxy/trafficgen/(.*)
+            path: /proxy/trafficgen/
             pathType: Prefix
   {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/stack/kubernetes/tools/ingress/jaeger-ingress.yaml b/stack/kubernetes/tools/ingress/jaeger-ingress.yaml
index efa2cacc..63630c02 100644
--- a/stack/kubernetes/tools/ingress/jaeger-ingress.yaml
+++ b/stack/kubernetes/tools/ingress/jaeger-ingress.yaml
@@ -17,7 +17,7 @@ spec:
                 name: tracing
                 port:
                   number: 80
-            path: /(.*)
+            path: /
             pathType: Prefix
   tls:
     - hosts:
diff --git a/stack/kubernetes/tools/istio/kiali.yaml b/stack/kubernetes/tools/istio/kiali.yaml
index 3e097268..7d0611a5 100644
--- a/stack/kubernetes/tools/istio/kiali.yaml
+++ b/stack/kubernetes/tools/istio/kiali.yaml
@@ -22,7 +22,7 @@ deployment:
                       name: kiali
                       port:
                         number: 20001
-                  path: /(.*)
+                  path: /
                   pathType: Prefix        
         tls:
           - hosts:
diff --git a/stack/kubernetes/tools/logging/kibana.yaml b/stack/kubernetes/tools/logging/kibana.yaml
index ca9e22d0..c3d6022e 100644
--- a/stack/kubernetes/tools/logging/kibana.yaml
+++ b/stack/kubernetes/tools/logging/kibana.yaml
@@ -23,7 +23,7 @@ ingress:
   hosts:
     - host: kibana.o11y.fans
       paths:
-        - path: /(.*)
+        - path: /
   tls:
     - secretName: kibana-tls-cert
       hosts: