Commit 1b7dff34 authored by dgiannopoulos's avatar dgiannopoulos
Browse files

fix: fixed kroki networking #26

parent d079425a

kubernetes/helm/openslice/templates/kroki-ingress.yaml

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
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

kubernetes/helm/openslice/templates/kroki.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ spec: 
            {{- toYaml .Values.resources | nindent 12 }}

            {{- toYaml .Values.resources | nindent 12 }}

          env:

          env:

            - name: KROKI_BLOCKDIAG_HOST

            - name: KROKI_BLOCKDIAG_HOST

              value: "blockdiag"

              value: {{ include "openslice.fullname" . }}-blockdiag

          ports:

          ports:

            - containerPort: 8000

            - containerPort: 8000

      restartPolicy: Always

      restartPolicy: Always

kubernetes/helm/openslice/templates/openslice-ingress.yaml

+15 −13
Original line number Original line Diff line number Diff line
@@ -16,7 +16,8 @@ spec: 
        paths:

        paths:

          {{- $root := . }} # Preserve the root context

          {{- $root := . }} # Preserve the root context

          {{- range .Values.ingress.paths }}

          {{- range .Values.ingress.paths }}

      - pathType: Prefix

          {{- if ne .path "/kroki/(.*)" }}

          - pathType: ImplementationSpecific

            path: "{{ .path }}"

            path: "{{ .path }}"

            backend:

            backend:

              service:

              service:
@@ -24,3 +25,4 @@ spec: 
                port:

                port:

                  number: {{ .port }}

                  number: {{ .port }}

          {{- end }}

          {{- end }}

          {{- end }}

kubernetes/helm/openslice/values.yaml

+3 −0
Original line number Original line Diff line number Diff line
@@ -185,6 +185,9 @@ ingress: 
  - path: "/auth"

  - path: "/auth"

    service: "keycloak"

    service: "keycloak"

    port: 8080

    port: 8080

  - path: "/kroki/(.*)"

    service: "kroki"

    port: 8000

  - path: "/osapi"

  - path: "/osapi"

    service: "osportalapi"

    service: "osportalapi"

    port: 13000

    port: 13000