Skip to content

Commit

Permalink
Hotfixes for ingress and artifact registry
Browse files Browse the repository at this point in the history
  • Loading branch information
lieberlois committed Jan 22, 2025
1 parent 237187d commit fde9397
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion local/kubernetes/tools/istio/kiali.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ deployment:
name: kiali
port:
number: 20001
path: /(.*)
path: /
pathType: Prefix
pod_annotations:
prometheus.io/scrape: "true"
Expand Down
2 changes: 1 addition & 1 deletion stack/application/frontend/nginx/dima.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion stack/kubernetes/24_deploy_logging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

# Might require:
# gcloud auth configure-docker gcr.io
./tools/logging/kibana-index/build_deploy.sh "$NAMESPACE"

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
name: {{ .Release.Name }}-{{ .Chart.Name }}-service
port:
number: 80
path: /(.*)
path: /
pathType: Prefix
{{- if .Values.global.tls.enabled }}
tls:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion stack/kubernetes/tools/ingress/jaeger-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
name: tracing
port:
number: 80
path: /(.*)
path: /
pathType: Prefix
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion stack/kubernetes/tools/istio/kiali.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ deployment:
name: kiali
port:
number: 20001
path: /(.*)
path: /
pathType: Prefix
tls:
- hosts:
Expand Down
2 changes: 1 addition & 1 deletion stack/kubernetes/tools/logging/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ingress:
hosts:
- host: kibana.o11y.fans
paths:
- path: /(.*)
- path: /
tls:
- secretName: kibana-tls-cert
hosts:
Expand Down

0 comments on commit fde9397

Please sign in to comment.