diff --git a/charts/open-meteo-service/templates/grafana-ingress.yaml b/charts/open-meteo-service/templates/grafana-ingress.yaml new file mode 100644 index 0000000..236f530 --- /dev/null +++ b/charts/open-meteo-service/templates/grafana-ingress.yaml @@ -0,0 +1,33 @@ +{{- if and .Values.grafana.enabled .Values.grafana.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "open-meteo-service.grafanaFullname" . }} + {{- if .Values.grafana.ingress.className }} + annotations: + kubernetes.io/ingress.class: {{ .Values.grafana.ingress.className }} + {{- end }} +spec: + {{- if .Values.grafana.ingress.className }} + ingressClassName: {{ .Values.grafana.ingress.className }} + {{- end }} + rules: + {{- range .Values.grafana.ingress.hosts }} + - host: {{ .host }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: {{ .pathType }} + backend: + service: + name: {{ include "open-meteo-service.grafanaFullname" $ }} + port: + number: {{ $.Values.grafana.service.port }} + {{- end }} + {{- end }} + {{- if .Values.grafana.ingress.tls }} + tls: + {{- toYaml .Values.grafana.ingress.tls | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/open-meteo-service/templates/prometheus-ingress.yaml b/charts/open-meteo-service/templates/prometheus-ingress.yaml new file mode 100644 index 0000000..21e9c79 --- /dev/null +++ b/charts/open-meteo-service/templates/prometheus-ingress.yaml @@ -0,0 +1,33 @@ +{{- if and .Values.prometheus.enabled .Values.prometheus.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "open-meteo-service.prometheusFullname" . }} + {{- if .Values.prometheus.ingress.className }} + annotations: + kubernetes.io/ingress.class: {{ .Values.prometheus.ingress.className }} + {{- end }} +spec: + {{- if .Values.prometheus.ingress.className }} + ingressClassName: {{ .Values.prometheus.ingress.className }} + {{- end }} + rules: + {{- range .Values.prometheus.ingress.hosts }} + - host: {{ .host }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: {{ .pathType }} + backend: + service: + name: {{ include "open-meteo-service.prometheusFullname" $ }} + port: + number: {{ $.Values.prometheus.service.port }} + {{- end }} + {{- end }} + {{- if .Values.prometheus.ingress.tls }} + tls: + {{- toYaml .Values.prometheus.ingress.tls | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/open-meteo-service/values.yaml b/charts/open-meteo-service/values.yaml index eaa8764..befd001 100644 --- a/charts/open-meteo-service/values.yaml +++ b/charts/open-meteo-service/values.yaml @@ -49,6 +49,15 @@ prometheus: service: type: ClusterIP port: 9090 + ingress: + enabled: false + className: "" + hosts: + - host: prometheus.local + paths: + - path: / + pathType: Prefix + tls: [] persistence: enabled: false accessModes: @@ -67,6 +76,15 @@ grafana: port: 3000 adminUser: admin adminPassword: admin + ingress: + enabled: false + className: "" + hosts: + - host: grafana.local + paths: + - path: / + pathType: Prefix + tls: [] persistence: enabled: false accessModes: diff --git a/manifests/open-meteo-service/values.yaml b/manifests/open-meteo-service/values.yaml index 07abdd9..7140077 100644 --- a/manifests/open-meteo-service/values.yaml +++ b/manifests/open-meteo-service/values.yaml @@ -13,7 +13,7 @@ service: port: 8000 ingress: - enabled: false + enabled: true className: "traefik" hosts: - host: open-meteo.dvirlabs.com @@ -52,6 +52,15 @@ prometheus: service: type: ClusterIP port: 9090 + ingress: + enabled: true + className: "traefik" + hosts: + - host: open-meteo-prometheus.dvirlabs.com + paths: + - path: / + pathType: Prefix + tls: [] persistence: enabled: false accessModes: @@ -70,6 +79,15 @@ grafana: port: 3000 adminUser: admin adminPassword: admin + ingress: + enabled: true + className: "traefik" + hosts: + - host: open-meteo-grafana.dvirlabs.com + paths: + - path: / + pathType: Prefix + tls: [] persistence: enabled: false accessModes: