diff --git a/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml b/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml index 150ad948..86f21640 100644 --- a/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml +++ b/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml @@ -27,32 +27,4 @@ spec: name: {{ template "osm-seed.fullname" . }}-nominatim-api port: number: 80 -{{- end }} -# apiVersion: networking.k8s.io/v1 -# kind: Ingress -# metadata: -# name: {{ template "osm-seed.fullname" . }}-ingress -# annotations: -# kubernetes.io/ingress.class: nginx -# cert-manager.io/cluster-issuer: letsencrypt-prod-issuer -# spec: -# ingressClassName: nginx -# tls: -# - hosts: -# {{- if .Values.web.ingressDomain }} -# - {{ .Values.web.ingressDomain }} -# {{- else }} -# - web.{{ .Values.domain }} -# {{- end }} -# secretName: {{ template "osm-seed.fullname" . }}-tls-secret -# rules: -# - host: {{ if .Values.web.ingressDomain }}{{ .Values.web.ingressDomain }}{{ else }}web.{{ .Values.domain }}{{ end }} -# http: -# paths: -# - path: / -# pathType: Prefix -# backend: -# service: -# name: {{ template "osm-seed.fullname" . }}-web -# port: -# number: 80 \ No newline at end of file +{{- end }} \ No newline at end of file diff --git a/osm-seed/templates/osmcha-app/ingress.yaml b/osm-seed/templates/osmcha-app/ingress.yaml index 7360e2d1..03de1b49 100644 --- a/osm-seed/templates/osmcha-app/ingress.yaml +++ b/osm-seed/templates/osmcha-app/ingress.yaml @@ -7,13 +7,17 @@ metadata: kubernetes.io/ingress.class: nginx cert-manager.io/cluster-issuer: letsencrypt-prod-issuer spec: + ingressClassName: nginx tls: - hosts: + {{- if .Values.osmchaApi.ingressDomain }} + - {{ .Values.osmchaApi.ingressDomain }} + {{- else }} - osmcha.{{ .Values.domain }} + {{- end }} secretName: {{ template "osm-seed.fullname" . }}-secret-osmcha - rules: - - host: osmcha.{{ .Values.domain }} + - host: {{ if .Values.osmchaApi.ingressDomain }}{{ .Values.osmchaApi.ingressDomain }}{{ else }}osmcha.{{ .Values.domain }}{{ end }} http: paths: - path: / diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml index 22c7f4dd..b9a4a0c5 100644 --- a/osm-seed/values.yaml +++ b/osm-seed/values.yaml @@ -609,6 +609,7 @@ overpassApi: name: "" tag: "" serviceAnnotations: {} + ingressDomain: overpass-api.dev.osmseed.org env: OVERPASS_META: "yes" OVERPASS_MODE: init @@ -747,6 +748,7 @@ osmchaApi: image: name: "ghcr.io/osmcha/osmcha-django" tag: "61a80e897b45fb9b1a177bf433fb79bfa7fda59d" + ingressDomain: osmcha.dev.osmseed.org env: DJANGO_SETTINGS_MODULE: "config.settings.production" OSMCHA_FRONTEND_VERSION: "v0.86.0-production"