Commit 41be18c6 authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

fix: corrected ingress job and paths

parent 6154f771

charts/hypo/templates/grafana/job.yaml

+14 −2
Original line number Diff line number Diff line
@@ -86,12 +86,24 @@ spec: 


              echo "Found Prometheus CR: ${PROM}"



              {{- if $kubePrometheusStack.prometheus.ingress.setup }}



              EXTERNAL_URL="http://${NODE_IP}:{{ $ingressNginx.controller.service.nodePorts.http }}/prometheus"



              {{- else }}



              EXTERNAL_URL="http://${NODE_IP}:{{ $kubePrometheusStack.prometheus.service.nodePort }}"



              {{- end }}



              echo "Setting Prometheus external URL to: ${EXTERNAL_URL}"



              kubectl patch prometheus "${PROM}" \

                -n "${RELEASE_NAMESPACE}" \

                --type merge \

                -p "{

                  \"spec\": {

                    \"externalUrl\": \"http://${NODE_IP}:{{ $ingressNginx.controller.service.nodePorts.http }}/prometheus\"

                    \"externalUrl\": \"${EXTERNAL_URL}\"

                  }

                }"

charts/hypo/templates/portal-cart/ingress.yaml

+1 −1
Original line number Diff line number Diff line 
{{ $ingressNginx := index .Values "ingress-nginx" }}

{{ $portalCart := index .Values "portal-cart" }}

{{- if $portalCart.enabled -}}

{{- if and $portalCart.enabled $portalCart.ingress.enabled -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

charts/hypo/templates/registry-api/ingress.yaml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
{{ $ingressNginx := index .Values "ingress-nginx" }}

{{ $registryApi := index .Values "registry-api" }}

{{- if and $registryApi.enabled $registryApi.ingress.enabled -}}

apiVersion: networking.k8s.io/v1

kind: Ingress

metadata:

  name: {{ template "hypo.registry-api.fullname" . }}

  namespace: {{ .Release.Namespace  }}

  annotations:

    nginx.ingress.kubernetes.io/ssl-redirect: "false"

spec:

  ingressClassName: {{ $ingressNginx.controller.ingressClass }}

  rules:

  - http:

      paths:

      - path: /registry-api

        pathType: Prefix

        backend:

          service:

            name: {{ template "hypo.registry-api.fullname" . }}

            port:

              number: {{ $registryApi.service.port }}

    {{ if eq .Values.installation "prod" }}

    host: hyper-orchestrator.eu

    {{- end }}

{{- end -}}

charts/hypo/values.yaml

+6 −0
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ portal-cart: 
    port: 8101

    nodePort: 30092



  ingress:

    enabled: true



  securityContext: {}



  resources: {}
@@ -447,6 +450,9 @@ registry-api: 
    port: 8091

    nodePort: 30094



  ingress:

    enabled: true



  securityContext: {}



  resources: {}