Skip to content
Snippets Groups Projects
Commit 1b7dff34 authored by dgiannopoulos's avatar dgiannopoulos
Browse files

fix: fixed kroki networking #26

parent d079425a
No related branches found
No related tags found
3 merge requests!34Merging develop (merged from 2024Q2_RC) into main creating for 2024Q2 Release,!33Merging 2024Q2_RC into main creating for 2024Q2 Release,!32Merging 2024Q2_RC into develop
Pipeline #7190 passed
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "openslice.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- include "openslice.labels" . | nindent 4 }}
annotations:
nginx.ingress.kubernetes.io/rewrite-target: "/$1"
name: {{ include "openslice.fullname" . }}-kroki-ingress
spec:
ingressClassName: nginx
rules:
- http:
paths:
- pathType: ImplementationSpecific
path: "/kroki/(.*)"
backend:
service:
name: {{ include "openslice.fullname" . }}-kroki
port:
number: 8000
......@@ -32,7 +32,7 @@ spec:
{{- toYaml .Values.resources | nindent 12 }}
env:
- name: KROKI_BLOCKDIAG_HOST
value: "blockdiag"
value: {{ include "openslice.fullname" . }}-blockdiag
ports:
- containerPort: 8000
restartPolicy: Always
......
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
metadata:
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "openslice.fullname" . }}
......@@ -12,15 +12,17 @@ metadata:
spec:
ingressClassName: nginx
rules:
- http:
paths:
{{- $root := . }} # Preserve the root context
{{- range .Values.ingress.paths }}
- pathType: Prefix
path: "{{ .path }}"
backend:
service:
name: {{ include "openslice.fullname" $root }}-{{ .service }}
port:
number: {{ .port }}
{{- end }}
- http:
paths:
{{- $root := . }} # Preserve the root context
{{- range .Values.ingress.paths }}
{{- if ne .path "/kroki/(.*)" }}
- pathType: ImplementationSpecific
path: "{{ .path }}"
backend:
service:
name: {{ include "openslice.fullname" $root }}-{{ .service }}
port:
number: {{ .port }}
{{- end }}
{{- end }}
......@@ -185,6 +185,9 @@ ingress:
- path: "/auth"
service: "keycloak"
port: 8080
- path: "/kroki/(.*)"
service: "kroki"
port: 8000
- path: "/osapi"
service: "osportalapi"
port: 13000
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment