fix typo in prometheus rule

charts/home-assistant/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: home-assistant
-version: 0.0.1
+version: 0.0.8
 description: Chart for Home Assistant
 keywords:
   - home-automation

charts/home-assistant/README.md

@@ -4,12 +4,13 @@
 
 Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts. Perfect to run on a Raspberry Pi or a local server. 
 
-This chart bootstraps a [Home-Assistant](https://github.com/benphelps/homepage) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps a [Home-Assistant](https://github.com/home-assistant) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Prerequisites
 
 - Kubernetes
 - Helm
+- Traefik v2 / IngressRoute
 - Authentik / Auth
 
 ## Parameters

charts/home-assistant/templates/deployment.yaml

@@ -43,12 +43,12 @@ spec:
           {{- with .Values.deployment.envFrom }}
           envFrom:
             {{- toYaml . | nindent 12 }}
-          {{- end }}              
+          {{- end }}
           volumeMounts:
             - mountPath: /config
               name: home-assistant-config
           resources:
-            {{- toYaml .Values.deployment.resources | nindent 12 }}              
+            {{- toYaml .Values.deployment.resources | nindent 12 }}
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.http.port }}
@@ -70,6 +70,7 @@ spec:
             failureThreshold: 30
             timeoutSeconds: 1
             periodSeconds: 5
+        {{- if .Values.codeserver.enabled }}
         - name: codeserver
           image: "{{ .Values.codeserver.image.repository }}:{{ .Values.codeserver.image.tag }}"
           imagePullPolicy: {{ .Values.codeserver.image.imagePullPolicy }}
@@ -85,12 +86,13 @@ spec:
           {{- with .Values.codeserver.envFrom }}
           envFrom:
             {{- toYaml . | nindent 12 }}
-          {{- end }}              
+          {{- end }}
           securityContext:
             {{- toYaml .Values.codeserver.securityContext | nindent 12 }}
           volumeMounts:
             - mountPath: /config/home-assistant
               name: home-assistant-config
+        {{- end }}
       volumes:
         - name: home-assistant-config
           persistentVolumeClaim:

charts/home-assistant/templates/ingress-route.yaml

@@ -0,0 +1,62 @@
+{{- if .Values.ingressRoute.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: home-assistant
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: home-assistant
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/managed-by: helm
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - kind: Rule
+      match: "Host(`{{ .Values.ingressRoute.host }}`)"
+      middlewares:
+        - name: authentik
+          namespace: {{ .Release.Namespace }}
+      priority: 10
+      services:
+        - kind: Service
+          name: home-assistant
+          port: {{ .Values.service.http.port }}
+    - kind: Rule
+      match: "Host(`{{ .Values.ingressRoute.host }}`) && PathPrefix(`/outpost.goauthentik.io/`)"
+      priority: 15
+      services:
+        - kind: Service
+          name: {{ .Values.ingressRoute.authentik.outpost }}
+          port: {{ .Values.ingressRoute.authentik.port }}
+{{- end }}
+
+---
+{{- if and .Values.codeserver.ingressRoute.enabled .Values.codeserver.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: home-assistant-codeserver
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: home-assistant
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: home-assistant
+    app.kubernetes.io/managed-by: helm
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - kind: Rule
+      match: "Host(`{{ .Values.codeserver.ingressRoute.host }}`)"
+      priority: 10
+      services:
+        - kind: Service
+          name: home-assistant-codeserver
+          port: {{ .Values.codeserver.service.http.port }}
+{{- end }}          

charts/home-assistant/templates/ingress.yaml

@@ -1,82 +0,0 @@
-{{- if .Values.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: home-assistant
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: home-assistant
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: helm
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-issuer
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-spec:
-  ingressClassName: "{{ .Values.ingress.host }}"
-  tls:
-    - hosts:
-        - "{{ .Values.ingress.host }}"
-      secretName: "{{ .Release.Name }}-secret-tls"
-  rules:
-    - host: "{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: /outpost.goauthentik.io/
-            pathType: Prefix
-            backend:
-              service:
-                name: "{{ .Values.ingress.authentik.outpost }}"
-                port:
-                  number: {{ .Values.ingress.authentik.port }}
-    - host: "{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: http
-                port:
-                  number: {{ .Values.service.http.port }}
-{{- end }}
-
----
-{{- if and .Values.codeserver.ingress.enabled Values.codeserver.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: codeserver-home-assistant
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: codeserver
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: helm
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-issuer
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.tls: "true"
-spec:
-  ingressClassName: "{{ .Values.codeserver.ingress.host }}"
-  tls:
-    - hosts:
-        - "{{ .Values.codeserver.ingress.host }}"
-      secretName: "codeserver-{{ .Release.Name }}-secret-tls"
-  rules:
-    - host: "{{ .Values.codeserver.ingress.host }}"
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: codeserver-http
-                port:
-                  number: {{ .Values.codeserver.service.http.port }}
-{{- end }}

charts/home-assistant/templates/middleware.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enabled }}
+{{- if .Values.ingressRoute.enabled }}
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
@@ -13,7 +13,7 @@ metadata:
     app.kubernetes.io/managed-by: helm
 spec:
   forwardAuth:
-    address: "http://{{ .Values.ingress.authentik.outpost }}.authentik:{{ .Values.ingress.authentik.port }}/outpost.goauthentik.io/auth/traefik"
+    address: "http://{{ .Values.ingressRoute.authentik.outpost }}.authentik:{{ .Values.ingressRoute.authentik.port }}/outpost.goauthentik.io/auth/traefik"
     trustForwardHeader: true
     authResponseHeaders:
       - X-authentik-username

charts/home-assistant/templates/prometheus-rule.yaml

@@ -15,5 +15,5 @@ spec:
   groups:
     - name: {{ .Release.Name }}
       rules:
-        {{- toYaml .Values.prometheusRule.rules | nindent 8 }}
+        {{- toYaml .Values.metrics.prometheusRule.rules | nindent 8 }}
 {{- end }}

charts/home-assistant/templates/service.yaml

@@ -13,23 +13,23 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ .Values.service.http.port }}
+    - port: {{ .Values.service.http.port }}
-    targetPort: http
+      targetPort: http
-    protocol: TCP
+      protocol: TCP
-    name: http
+      name: http
   selector:
     app.kubernetes.io/name: home-assistant
     app.kubernetes.io/instance: {{ .Release.Name }}
 
 ---
-{{- if Values.codeserver.enabled }}
+{{- if .Values.codeserver.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
   name: home-assistant-codeserver
   namespace: {{ .Release.Namespace }}  
   labels:
-    app.kubernetes.io/name: code-server
+    app.kubernetes.io/name: home-assistant
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -38,11 +38,11 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: {{ .Values.codeserver.service.http.port }}
+    - port: {{ .Values.codeserver.service.http.port }}
-    targetPort: codeserver-http
+      targetPort: codeserver-http
-    protocol: TCP
+      protocol: TCP
-    name: codeserver-http
+      name: codeserver-http
   selector:
-    app.kubernetes.io/name: codeserver
+    app.kubernetes.io/name: home-assistant
     app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

charts/home-assistant/values.yaml

@@ -18,7 +18,7 @@ deployment:
 service:
   http:
     port: 8123
-ingress:
+ingressRoute:
   enabled: true
   host: homeassistant.alexlebens.net
   authentik:
@@ -69,6 +69,6 @@ codeserver:
   service:
     http:
       port: 8443
-  ingress:
+  ingressRoute:
     enabled: true
     host: codeserver.homeassistant.alexlebens.net