From eadbf37ce52a0ee94ef22b7166067a32a2ae06dd Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 05:46:15 -0600 Subject: [PATCH 01/13] update home-assistant --- charts/home-assistant/Chart.yaml | 2 +- charts/home-assistant/templates/deployment.yaml | 1 - .../home-assistant/templates/ingress-route.yaml | 6 ++---- charts/home-assistant/templates/middleware.yaml | 7 +++---- .../templates/persistant-volume-claim.yaml | 1 - .../templates/prometheus-rule.yaml | 1 - .../templates/service-account.yaml | 1 - .../templates/service-monitor.yaml | 1 - charts/home-assistant/templates/service.yaml | 6 ++---- charts/home-assistant/values.yaml | 16 ++++++++-------- 10 files changed, 16 insertions(+), 26 deletions(-) diff --git a/charts/home-assistant/Chart.yaml b/charts/home-assistant/Chart.yaml index 14fd843..91c7736 100644 --- a/charts/home-assistant/Chart.yaml +++ b/charts/home-assistant/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: home-assistant -version: 0.0.14 +version: 0.0.15 description: Chart for Home Assistant keywords: - home-automation diff --git a/charts/home-assistant/templates/deployment.yaml b/charts/home-assistant/templates/deployment.yaml index 7f440db..6682c6b 100644 --- a/charts/home-assistant/templates/deployment.yaml +++ b/charts/home-assistant/templates/deployment.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm spec: revisionHistoryLimit: 3 replicas: {{ .Values.deployment.replicas }} diff --git a/charts/home-assistant/templates/ingress-route.yaml b/charts/home-assistant/templates/ingress-route.yaml index ead53a0..c94d1bd 100644 --- a/charts/home-assistant/templates/ingress-route.yaml +++ b/charts/home-assistant/templates/ingress-route.yaml @@ -10,7 +10,6 @@ metadata: 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 @@ -18,7 +17,7 @@ spec: - kind: Rule match: "Host(`{{ .Values.ingressRoute.host }}`)" middlewares: - - name: authentik + - name: "authentik-{{ .Release.Name }}" namespace: {{ .Release.Namespace }} priority: 10 services: @@ -47,7 +46,6 @@ metadata: 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 @@ -59,4 +57,4 @@ spec: - kind: Service name: home-assistant-codeserver port: {{ .Values.codeserver.service.http.port }} -{{- end }} +{{- end }} diff --git a/charts/home-assistant/templates/middleware.yaml b/charts/home-assistant/templates/middleware.yaml index 4988c1e..813876f 100644 --- a/charts/home-assistant/templates/middleware.yaml +++ b/charts/home-assistant/templates/middleware.yaml @@ -2,15 +2,14 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: - name: authentik + name: "authentik-{{ .Release.Name }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: home-assistant + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: auth - app.kubernetes.io/part-of: home-assistant - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: {{ .Release.Name }} spec: forwardAuth: address: "http://{{ .Values.ingressRoute.authentik.outpost }}.authentik:{{ .Values.ingressRoute.authentik.port }}/outpost.goauthentik.io/auth/traefik" diff --git a/charts/home-assistant/templates/persistant-volume-claim.yaml b/charts/home-assistant/templates/persistant-volume-claim.yaml index fba578b..e400e12 100644 --- a/charts/home-assistant/templates/persistant-volume-claim.yaml +++ b/charts/home-assistant/templates/persistant-volume-claim.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm spec: accessModes: - ReadWriteOnce diff --git a/charts/home-assistant/templates/prometheus-rule.yaml b/charts/home-assistant/templates/prometheus-rule.yaml index 3e9d101..a0f9fed 100644 --- a/charts/home-assistant/templates/prometheus-rule.yaml +++ b/charts/home-assistant/templates/prometheus-rule.yaml @@ -10,7 +10,6 @@ metadata: 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: groups: - name: {{ .Release.Name }} diff --git a/charts/home-assistant/templates/service-account.yaml b/charts/home-assistant/templates/service-account.yaml index 3344355..55ba961 100644 --- a/charts/home-assistant/templates/service-account.yaml +++ b/charts/home-assistant/templates/service-account.yaml @@ -9,4 +9,3 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: home-assistant - app.kubernetes.io/managed-by: helm diff --git a/charts/home-assistant/templates/service-monitor.yaml b/charts/home-assistant/templates/service-monitor.yaml index ac169ad..8019d9a 100644 --- a/charts/home-assistant/templates/service-monitor.yaml +++ b/charts/home-assistant/templates/service-monitor.yaml @@ -10,7 +10,6 @@ metadata: 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: selector: matchLabels: diff --git a/charts/home-assistant/templates/service.yaml b/charts/home-assistant/templates/service.yaml index 0dafd80..9c78673 100644 --- a/charts/home-assistant/templates/service.yaml +++ b/charts/home-assistant/templates/service.yaml @@ -2,14 +2,13 @@ apiVersion: v1 kind: Service metadata: name: home-assistant - namespace: {{ .Release.Namespace }} + 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 spec: type: ClusterIP ports: @@ -27,14 +26,13 @@ apiVersion: v1 kind: Service metadata: name: home-assistant-codeserver - namespace: {{ .Release.Namespace }} + 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 spec: type: ClusterIP ports: diff --git a/charts/home-assistant/values.yaml b/charts/home-assistant/values.yaml index f8a476f..e4a5812 100644 --- a/charts/home-assistant/values.yaml +++ b/charts/home-assistant/values.yaml @@ -3,10 +3,10 @@ deployment: strategy: Recreate image: repository: homeassistant/home-assistant - tag: 2024.2.5 + tag: 2024.3.0 imagePullPolicy: IfNotPresent env: - TZ: US/Mountain + TZ: UTC envFrom: resources: requests: @@ -20,7 +20,7 @@ service: port: 8123 ingressRoute: enabled: true - host: homeassistant.alexlebens.net + host: authentik: outpost: authentik-proxy-outpost port: 9000 @@ -49,17 +49,17 @@ metrics: severity: critical persistence: config: - storageClassName: ceph-block + storageClassName: default storageSize: 1Gi volumeMode: Filesystem codeserver: - enabled: true + enabled: false image: repository: linuxserver/code-server tag: 4.22.0 imagePullPolicy: IfNotPresent env: - TZ: US/Mountain + TZ: UTC PUID: 1000 PGID: 1000 DEFAULT_WORKSPACE: /config @@ -70,5 +70,5 @@ codeserver: http: port: 8443 ingressRoute: - enabled: true - host: codeserver.homeassistant.alexlebens.net + enabled: false + host: From 1fe5c07c36d3b1548e59be0400ed19fa5e4e1906 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 05:49:35 -0600 Subject: [PATCH 02/13] update homepage --- charts/homepage/Chart.yaml | 4 ++-- charts/homepage/templates/cluster-role-binding.yaml | 1 - charts/homepage/templates/cluster-role.yaml | 1 - charts/homepage/templates/config-map.yaml | 1 - charts/homepage/templates/deployment.yaml | 1 - charts/homepage/templates/ingress-route.yaml | 3 +-- charts/homepage/templates/middleware.yaml | 7 +++---- charts/homepage/templates/secret.yaml | 1 - charts/homepage/templates/service-account.yaml | 1 - charts/homepage/templates/service.yaml | 1 - charts/homepage/values.yaml | 4 ++-- 11 files changed, 8 insertions(+), 17 deletions(-) diff --git a/charts/homepage/Chart.yaml b/charts/homepage/Chart.yaml index c65b76e..fd299d7 100644 --- a/charts/homepage/Chart.yaml +++ b/charts/homepage/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: homepage -version: 0.0.5 +version: 0.0.6 description: Chart for benphelps homepage keywords: - dashboard @@ -9,4 +9,4 @@ sources: maintainers: - name: alexlebens icon: https://github.com/benphelps/homepage/blob/de584eae8f12a0d257e554e9511ef19bd2a1232c/public/mstile-150x150.png -appVersion: v0.8.8 +appVersion: v0.8.9 diff --git a/charts/homepage/templates/cluster-role-binding.yaml b/charts/homepage/templates/cluster-role-binding.yaml index 0bbbe37..6bfc0b0 100644 --- a/charts/homepage/templates/cluster-role-binding.yaml +++ b/charts/homepage/templates/cluster-role-binding.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/homepage/templates/cluster-role.yaml b/charts/homepage/templates/cluster-role.yaml index 8be89a5..25563fb 100644 --- a/charts/homepage/templates/cluster-role.yaml +++ b/charts/homepage/templates/cluster-role.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm rules: - apiGroups: - "" diff --git a/charts/homepage/templates/config-map.yaml b/charts/homepage/templates/config-map.yaml index 7fdfbae..bcc1c82 100644 --- a/charts/homepage/templates/config-map.yaml +++ b/charts/homepage/templates/config-map.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm data: bookmarks.yaml: {{- if .Values.config.bookmarks }} | {{- .Values.config.bookmarks | toYaml | nindent 4}} diff --git a/charts/homepage/templates/deployment.yaml b/charts/homepage/templates/deployment.yaml index 2df3609..6d63196 100644 --- a/charts/homepage/templates/deployment.yaml +++ b/charts/homepage/templates/deployment.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm spec: revisionHistoryLimit: 3 replicas: {{ .Values.deployment.replicas }} diff --git a/charts/homepage/templates/ingress-route.yaml b/charts/homepage/templates/ingress-route.yaml index 2c329ea..7cc00d2 100644 --- a/charts/homepage/templates/ingress-route.yaml +++ b/charts/homepage/templates/ingress-route.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm spec: entryPoints: - websecure @@ -17,7 +16,7 @@ spec: - kind: Rule match: "Host(`{{ .Values.ingressRoute.host }}`)" middlewares: - - name: authentik + - name: "authentik-{{ .Release.Name }}" namespace: {{ .Release.Namespace }} priority: 10 services: diff --git a/charts/homepage/templates/middleware.yaml b/charts/homepage/templates/middleware.yaml index 72bae78..4d395fa 100644 --- a/charts/homepage/templates/middleware.yaml +++ b/charts/homepage/templates/middleware.yaml @@ -1,15 +1,14 @@ apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: - name: authentik + name: "authentik-{{ .Release.Name }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: homepage + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: auth - app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: {{ .Release.Name }} spec: forwardAuth: address: "http://{{ .Values.ingressRoute.authentik.outpost }}.authentik:{{ .Values.ingressRoute.authentik.port }}/outpost.goauthentik.io/auth/traefik" diff --git a/charts/homepage/templates/secret.yaml b/charts/homepage/templates/secret.yaml index a8a67c7..7f0d8bf 100644 --- a/charts/homepage/templates/secret.yaml +++ b/charts/homepage/templates/secret.yaml @@ -10,6 +10,5 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm annotations: kubernetes.io/service-account.name: homepage diff --git a/charts/homepage/templates/service-account.yaml b/charts/homepage/templates/service-account.yaml index cc715e6..015eaac 100644 --- a/charts/homepage/templates/service-account.yaml +++ b/charts/homepage/templates/service-account.yaml @@ -9,6 +9,5 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm secrets: - name: "{{ .Release.Name }}-sa-token" diff --git a/charts/homepage/templates/service.yaml b/charts/homepage/templates/service.yaml index 3b777f8..8a69ac5 100644 --- a/charts/homepage/templates/service.yaml +++ b/charts/homepage/templates/service.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: homepage - app.kubernetes.io/managed-by: helm spec: type: ClusterIP ports: diff --git a/charts/homepage/values.yaml b/charts/homepage/values.yaml index e875184..6b6b0be 100644 --- a/charts/homepage/values.yaml +++ b/charts/homepage/values.yaml @@ -3,7 +3,7 @@ deployment: strategy: Recreate image: repository: ghcr.io/gethomepage/homepage - tag: v0.8.8 + tag: v0.8.9 imagePullPolicy: IfNotPresent env: envFrom: @@ -18,7 +18,7 @@ service: http: port: 3000 ingressRoute: - host: homepage.alexlebens.net + host: authentik: outpost: authentik-proxy-outpost port: 9000 From 8fb910383d6dc9e11ff0bc63b90c36c31b820a54 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 05:54:53 -0600 Subject: [PATCH 03/13] update kubelet-serving-cert-approver --- .../kubelet-serving-cert-approver/Chart.yaml | 2 +- .../templates/cluster-role-binding.yaml | 7 +++---- .../templates/cluster-role.yaml | 10 ++++------ .../templates/deployment.yaml | 18 +++++++++--------- .../templates/namespace.yaml | 4 ++-- .../templates/role-binding.yaml | 7 +++---- .../templates/service-account.yaml | 7 +++---- .../templates/service.yaml | 9 ++++----- 8 files changed, 29 insertions(+), 35 deletions(-) diff --git a/charts/kubelet-serving-cert-approver/Chart.yaml b/charts/kubelet-serving-cert-approver/Chart.yaml index 5ead10b..60a5cd9 100644 --- a/charts/kubelet-serving-cert-approver/Chart.yaml +++ b/charts/kubelet-serving-cert-approver/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: kubelet-serving-cert-approver -version: 0.0.3 +version: 0.0.4 description: Kubelet Serving TLS Certificate Signing Request Approver keywords: - kubernetes diff --git a/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml b/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml index 04f48ec..47fab8b 100644 --- a/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml +++ b/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml @@ -1,15 +1,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml b/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml index 3c99585..744a52d 100644 --- a/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml +++ b/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml @@ -4,12 +4,11 @@ metadata: name: "certificates:{{ .Release.Name }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver rules: - apiGroups: - certificates.k8s.io @@ -47,12 +46,11 @@ metadata: name: "events:{{ .Release.Name }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approverv rules: - apiGroups: - "" diff --git a/charts/kubelet-serving-cert-approver/templates/deployment.yaml b/charts/kubelet-serving-cert-approver/templates/deployment.yaml index f0689ba..5327ecc 100644 --- a/charts/kubelet-serving-cert-approver/templates/deployment.yaml +++ b/charts/kubelet-serving-cert-approver/templates/deployment.yaml @@ -1,15 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver spec: revisionHistoryLimit: 3 replicas: {{ .Values.deployment.replicas }} @@ -17,13 +16,14 @@ spec: type: {{ .Values.deployment.strategy }} selector: matchLabels: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} + template: metadata: labels: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} spec: affinity: nodeAffinity: @@ -43,7 +43,7 @@ spec: - containerPort: 8080 name: health - containerPort: 9090 - name: metrics + name: metrics args: - serve env: @@ -52,7 +52,7 @@ spec: fieldRef: fieldPath: metadata.namespace resources: - {{- toYaml .Values.deployment.resources | nindent 12 }} + {{- toYaml .Values.deployment.resources | nindent 12 }} livenessProbe: httpGet: path: /healthz @@ -78,7 +78,7 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault - serviceAccountName: {{ .Release.Name }} + serviceAccountName: kubelet-serving-cert-approver tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master diff --git a/charts/kubelet-serving-cert-approver/templates/namespace.yaml b/charts/kubelet-serving-cert-approver/templates/namespace.yaml index 5ddca1e..18e109b 100644 --- a/charts/kubelet-serving-cert-approver/templates/namespace.yaml +++ b/charts/kubelet-serving-cert-approver/templates/namespace.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver labels: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} pod-security.kubernetes.io/audit: restricted pod-security.kubernetes.io/enforce: restricted pod-security.kubernetes.io/warn: restricted diff --git a/charts/kubelet-serving-cert-approver/templates/role-binding.yaml b/charts/kubelet-serving-cert-approver/templates/role-binding.yaml index 72bc269..94da549 100644 --- a/charts/kubelet-serving-cert-approver/templates/role-binding.yaml +++ b/charts/kubelet-serving-cert-approver/templates/role-binding.yaml @@ -4,17 +4,16 @@ metadata: name: "events:{{ .Release.Name }}" namespace: default labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: "events:{{ .Release.Name }}" subjects: - kind: ServiceAccount - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Name }} diff --git a/charts/kubelet-serving-cert-approver/templates/service-account.yaml b/charts/kubelet-serving-cert-approver/templates/service-account.yaml index 132ae90..710325e 100644 --- a/charts/kubelet-serving-cert-approver/templates/service-account.yaml +++ b/charts/kubelet-serving-cert-approver/templates/service-account.yaml @@ -1,12 +1,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver diff --git a/charts/kubelet-serving-cert-approver/templates/service.yaml b/charts/kubelet-serving-cert-approver/templates/service.yaml index e7c1f3d..f0fd270 100644 --- a/charts/kubelet-serving-cert-approver/templates/service.yaml +++ b/charts/kubelet-serving-cert-approver/templates/service.yaml @@ -1,15 +1,14 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver spec: ports: - name: metrics @@ -17,5 +16,5 @@ spec: protocol: TCP targetPort: metrics selector: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} From 81ab282822f187b6efe7756fbb632e8d62c72f4b Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 06:00:19 -0600 Subject: [PATCH 04/13] update outline --- charts/outline/Chart.yaml | 4 ++-- charts/outline/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/outline/Chart.yaml b/charts/outline/Chart.yaml index ced379b..8673803 100644 --- a/charts/outline/Chart.yaml +++ b/charts/outline/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: outline -version: 0.0.1 +version: 0.0.2 description: Chart for Outline wiki keywords: - wiki @@ -10,7 +10,7 @@ sources: - https://github.com/bitnami/charts/tree/main/bitnami/redis maintainers: - name: alexlebens -icon: https://avatars.githubusercontent.com/u/1765001?s=48&v=4 +icon: https://avatars.githubusercontent.com/u/1765001?s=48&v=4 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami diff --git a/charts/outline/values.yaml b/charts/outline/values.yaml index c3e8ed5..c59e987 100644 --- a/charts/outline/values.yaml +++ b/charts/outline/values.yaml @@ -19,7 +19,7 @@ ingress: enabled: true className: traefik annotations: - host: outline.alexlebens.net + host: persistence: type: s3 s3: @@ -41,7 +41,7 @@ redis: enabled: false outline: nodeEnv: production - url: https://outline.alexlebens.net + url: secretKey: existingSecretName: outline-key-secret existingSecretKey: secret-key From 773ff534326904cef05c6421e1561ab16e8b0f42 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 06:00:36 -0600 Subject: [PATCH 05/13] update postgresql cluster --- charts/postgres-cluster/Chart.yaml | 2 +- charts/postgres-cluster/README.md | 2 +- .../templates/postgresql-cluster.yaml | 1 - charts/postgres-cluster/values.yaml | 12 ++++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml index aa74337..a8a636b 100644 --- a/charts/postgres-cluster/Chart.yaml +++ b/charts/postgres-cluster/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: postgres-cluster -version: 0.2.1 +version: 0.2.2 description: Chart for cloudnative-pg cluster keywords: - database diff --git a/charts/postgres-cluster/README.md b/charts/postgres-cluster/README.md index 02b30e8..c9f0b8b 100644 --- a/charts/postgres-cluster/README.md +++ b/charts/postgres-cluster/README.md @@ -2,7 +2,7 @@ [CloudNative PG](https://github.com/cloudnative-pg/cloudnative-pg) -CloudNativePG is the Kubernetes operator that covers the full lifecycle of a highly available PostgreSQL database cluster with a primary/standby architecture, using native streaming replication. +CloudNativePG is the Kubernetes operator that covers the full lifecycle of a highly available PostgreSQL database cluster with a primary/standby architecture, using native streaming replication. This chart bootstraps a [CNPG](https://github.com/cloudnative-pg/cloudnative-pg) cluster on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. diff --git a/charts/postgres-cluster/templates/postgresql-cluster.yaml b/charts/postgres-cluster/templates/postgresql-cluster.yaml index 79b279c..dc1b025 100644 --- a/charts/postgres-cluster/templates/postgresql-cluster.yaml +++ b/charts/postgres-cluster/templates/postgresql-cluster.yaml @@ -9,7 +9,6 @@ metadata: app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: database app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm spec: imageName: "{{ .Values.cluster.image.repository }}:{{ .Values.cluster.image.tag }}" instances: {{ .Values.cluster.instances }} diff --git a/charts/postgres-cluster/values.yaml b/charts/postgres-cluster/values.yaml index 6a53f57..209e895 100644 --- a/charts/postgres-cluster/values.yaml +++ b/charts/postgres-cluster/values.yaml @@ -19,16 +19,16 @@ cluster: hugepages-2Mi: 512Mi storage: data: - storageClass: ceph-block + storageClass: default size: 10Gi wal: - storageClass: ceph-block + storageClass: default size: 2Gi bootstrap: recoveryEnabled: false recoveryIndex: 1 - endpointURL: https://nyc3.digitaloceanspaces.com - bucket: alexlebens.net + endpointURL: + bucket: initdbEnabled: false initdb: database: app @@ -38,5 +38,5 @@ backup: schedule: "0 0 0 * * *" retentionPolicy: 14d backupIndex: 1 - endpointURL: https://nyc3.digitaloceanspaces.com - bucket: alexlebens.net + endpointURL: + bucket: From 8ffe5fd40805e38985b5214157bec8f36eec04f8 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 06:05:23 -0600 Subject: [PATCH 06/13] update renovate config --- .github/renovate.json | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 5f75b38..2790f03 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -45,19 +45,15 @@ "matchPackageNames": [ "linuxserver/calibre", "homeassistant/home-assistant", + "linuxserver/code-server", "ghcr.io/gethomepage/homepage", - "ghcr.io/cloudnative-pg/postgresql", - "linuxserver/code-server" + "ghcr.io/alex1989hu/kubelet-serving-cert-approver", + "rmcrackan/libation", + "outlinewiki/outline", + "ghcr.io/cloudnative-pg/postgresql" ], "matchDatasources": [ - "docker", - "gitea-releases", - "gitea-tags", - "github-releases", - "github-tags", - "gitlab-packages", - "gitlab-releases", - "gitlab-tags" + "docker" ], "schedule": [ "after 10am on tuesday", @@ -71,6 +67,27 @@ "bumpVersion": "minor", "automerge": false, "minimumReleaseAge": "3 days" + }, + { + "description": "Generate application charts on Tuesdays", + "matchPackageNames": [ + "redis" + ], + "matchDatasources": [ + "helm" + ], + "schedule": [ + "after 10am on tuesday", + "before 5pm on tuesday" + ], + "addLabels": [ + "upgrade", + "weekly", + "chart" + ], + "bumpVersion": "minor", + "automerge": false, + "minimumReleaseAge": "3 days" } ] -} \ No newline at end of file +} From 6c11bf51b204f04d5b2a2f1eac9b48af71a202cd Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 00:18:14 -0600 Subject: [PATCH 07/13] change cluster role names --- charts/homepage/Chart.yaml | 2 +- charts/homepage/templates/cluster-role-binding.yaml | 8 ++++---- charts/homepage/templates/cluster-role.yaml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/homepage/Chart.yaml b/charts/homepage/Chart.yaml index fd299d7..38e82dc 100644 --- a/charts/homepage/Chart.yaml +++ b/charts/homepage/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: homepage -version: 0.0.6 +version: 0.0.7 description: Chart for benphelps homepage keywords: - dashboard diff --git a/charts/homepage/templates/cluster-role-binding.yaml b/charts/homepage/templates/cluster-role-binding.yaml index 6bfc0b0..0c27f64 100644 --- a/charts/homepage/templates/cluster-role-binding.yaml +++ b/charts/homepage/templates/cluster-role-binding.yaml @@ -1,18 +1,18 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: homepage + name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: homepage + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web - app.kubernetes.io/part-of: homepage + app.kubernetes.io/part-of: {{ .Release.Name }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: homepage + name: {{ .Release.Name }} subjects: - kind: ServiceAccount name: homepage diff --git a/charts/homepage/templates/cluster-role.yaml b/charts/homepage/templates/cluster-role.yaml index 25563fb..c71cb25 100644 --- a/charts/homepage/templates/cluster-role.yaml +++ b/charts/homepage/templates/cluster-role.yaml @@ -1,14 +1,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: homepage + name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: homepage + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web - app.kubernetes.io/part-of: homepage + app.kubernetes.io/part-of: {{ .Release.Name }} rules: - apiGroups: - "" From ba0c6fe7d24dc4ad0ab94d4c008405233c0b32b7 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 01:30:16 -0600 Subject: [PATCH 08/13] fix values paths --- charts/libation/Chart.yaml | 2 +- charts/libation/templates/job.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/libation/Chart.yaml b/charts/libation/Chart.yaml index 043d806..a802441 100644 --- a/charts/libation/Chart.yaml +++ b/charts/libation/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: libation -version: 0.0.4 +version: 0.0.5 description: Import library from audible keywords: - audiobooks diff --git a/charts/libation/templates/job.yaml b/charts/libation/templates/job.yaml index 58dde48..0a0467b 100644 --- a/charts/libation/templates/job.yaml +++ b/charts/libation/templates/job.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/component: job app.kubernetes.io/part-of: libation spec: - schedule: {{ .Values.libation.job.schedule }} + schedule: {{ .Values.job.schedule }} successfulJobsHistoryLimit: 3 failedJobsHistoryLimit: 3 jobTemplate: @@ -20,8 +20,8 @@ spec: restartPolicy: Never containers: - name: libation - image: "{{ .Values.libation.image.repository }}:{{ .Values.libation.image.tag }}" - imagePullPolicy: {{ .Values.libation.image.pullPolicy }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} env: - name: SLEEP_TIME value: "-1" From 2b9ea0bcdb23b9f2d984e9f0e48feada23dcc519 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 06:32:41 -0600 Subject: [PATCH 09/13] fix bootstrap switch --- charts/postgres-cluster/Chart.yaml | 2 +- charts/postgres-cluster/templates/postgresql-cluster.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/postgres-cluster/Chart.yaml b/charts/postgres-cluster/Chart.yaml index a8a636b..0f6499e 100644 --- a/charts/postgres-cluster/Chart.yaml +++ b/charts/postgres-cluster/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: postgres-cluster -version: 0.2.2 +version: 0.2.3 description: Chart for cloudnative-pg cluster keywords: - database diff --git a/charts/postgres-cluster/templates/postgresql-cluster.yaml b/charts/postgres-cluster/templates/postgresql-cluster.yaml index dc1b025..071e548 100644 --- a/charts/postgres-cluster/templates/postgresql-cluster.yaml +++ b/charts/postgres-cluster/templates/postgresql-cluster.yaml @@ -38,7 +38,7 @@ spec: {{- toYaml .Values.bootstrap.initdb | nindent 6 }} {{- end }} - {{- if .Values.backup.recoveryEnabled }} + {{- if .Values.bootstrap.recoveryEnabled }} bootstrap: recovery: source: "postgresql-{{ .Release.Name }}-cluster-backup-index-{{ .Values.bootstrap.recoveryIndex }}" From 627f2ca6b66b113a2aee31e05b73df06dcb22bdb Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 08:46:52 -0600 Subject: [PATCH 10/13] enable configmap for s3 --- charts/outline/Chart.yaml | 2 +- charts/outline/templates/deployment.yaml | 25 ++++++++++++++++++++++++ charts/outline/values.yaml | 21 +++++++++++++------- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/charts/outline/Chart.yaml b/charts/outline/Chart.yaml index 8673803..35baea7 100644 --- a/charts/outline/Chart.yaml +++ b/charts/outline/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: outline -version: 0.0.2 +version: 0.0.3 description: Chart for Outline wiki keywords: - wiki diff --git a/charts/outline/templates/deployment.yaml b/charts/outline/templates/deployment.yaml index 3555e5d..48e11de 100644 --- a/charts/outline/templates/deployment.yaml +++ b/charts/outline/templates/deployment.yaml @@ -91,12 +91,37 @@ spec: secretKeyRef: name: "{{ .Values.persistence.s3.credentialsSecret }}" key: AWS_SECRET_ACCESS_KEY + {{- if .Values.persistence.s3.endpointConfigMap.enabled }} + - name: AWS_REGION + valueFrom: + configMapKeyRef: + name: "{{ .Values.persistence.s3.endpointConfigMap.name }}" + key: BUCKET_REGION + - name: AWS_S3_UPLOAD_BUCKET_NAME + valueFrom: + configMapKeyRef: + name: "{{ .Values.persistence.s3.endpointConfigMap.name }}" + key: BUCKET_NAME + - name: AWS_S3_UPLOAD_BUCKET_HOST + valueFrom: + configMapKeyRef: + name: "{{ .Values.persistence.s3.endpointConfigMap.name }}" + key: BUCKET_HOST + - name: AWS_S3_UPLOAD_BUCKET_PORT + valueFrom: + configMapKeyRef: + name: "{{ .Values.persistence.s3.endpointConfigMap.name }}" + key: BUCKET_PORT + - name: AWS_S3_UPLOAD_BUCKET_URL + value: "$(AWS_S3_UPLOAD_BUCKET_HOST):$(AWS_S3_UPLOAD_BUCKET_PORT)|" + {{- else }} - name: AWS_REGION value: "{{ .Values.persistence.s3.region }}" - name: AWS_S3_UPLOAD_BUCKET_NAME value: "{{ .Values.persistence.s3.bucketName }}" - name: AWS_S3_UPLOAD_BUCKET_URL value: "{{ .Values.persistence.s3.endpoint }}" + {{- end }} - name: AWS_S3_FORCE_PATH_STYLE value: "{{ .Values.persistence.s3.forcePathStyle }}" - name: AWS_S3_ACL diff --git a/charts/outline/values.yaml b/charts/outline/values.yaml index c59e987..81f33f1 100644 --- a/charts/outline/values.yaml +++ b/charts/outline/values.yaml @@ -23,9 +23,12 @@ ingress: persistence: type: s3 s3: - credentialsSecret: outline-s3-secret - region: us-east-1 - bucketName: outline + credentialsSecret: + endpointConfigMap: + enabled: false + name: + region: + bucketName: endpoint: uploadMaxSize: "26214400" forcePathStyle: false @@ -50,13 +53,17 @@ outline: existingSecretKey: utils-key database: passwordSecret: - existingSecretName: postgresql-outline-cluster-app + existingSecretName: existingSecretKey: password usernameSecret: - existingSecretName: postgresql-outline-cluster-app + existingSecretName: existingSecretKey: username - databaseName: app - databaseHost: postgresql-outline-cluster-rw + databaseName: + existingSecretName: + existingSecretKey: dbname + databaseHost: + existingSecretName: + existingSecretKey: host connectionPoolMin: "" connectionPoolMax: "20" sslMode: disable From c485eb968204f99ba293e0f02a73d5dd94876e48 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 08:51:37 -0600 Subject: [PATCH 11/13] change depcreciated env value --- charts/outline/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/outline/templates/deployment.yaml b/charts/outline/templates/deployment.yaml index 48e11de..9de3d2a 100644 --- a/charts/outline/templates/deployment.yaml +++ b/charts/outline/templates/deployment.yaml @@ -141,7 +141,7 @@ spec: value: "{{ .Values.outline.optional.enableUpdates }}" - name: WEB_CONCURRENCY value: "{{ .Values.outline.optional.webConcurrency }}" - - name: MAXIMUM_IMPORT_SIZE + - name: FILE_STORAGE_IMPORT_MAX_SIZE value: "{{ .Values.outline.optional.maximumImportSize }}" - name: LOG_LEVEL value: "{{ .Values.outline.optional.logLevel }}" From b31dab5a46239edcc4bde81b6609e35d3138f475 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 08:52:39 -0600 Subject: [PATCH 12/13] inject db secrets into deployment --- charts/outline/Chart.yaml | 2 +- charts/outline/templates/deployment.yaml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/charts/outline/Chart.yaml b/charts/outline/Chart.yaml index 35baea7..66c8da7 100644 --- a/charts/outline/Chart.yaml +++ b/charts/outline/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: outline -version: 0.0.3 +version: 0.0.4 description: Chart for Outline wiki keywords: - wiki diff --git a/charts/outline/templates/deployment.yaml b/charts/outline/templates/deployment.yaml index 9de3d2a..5c66ffc 100644 --- a/charts/outline/templates/deployment.yaml +++ b/charts/outline/templates/deployment.yaml @@ -62,9 +62,15 @@ spec: name: "{{ .Values.outline.database.usernameSecret.existingSecretName }}" key: "{{ .Values.outline.database.usernameSecret.existingSecretKey }}" - name: POSTGRES_DATABASE_NAME - value: {{ .Values.outline.database.databaseName }} + valueFrom: + secretKeyRef: + name: "{{ .Values.outline.database.databaseName.existingSecretName }}" + key: "{{ .Values.outline.database.databaseName.existingSecretKey }}" - name: POSTGRES_DATABASE_HOST - value: {{ .Values.outline.database.databaseHost }} + valueFrom: + secretKeyRef: + name: "{{ .Values.outline.database.databaseHost.existingSecretName }}" + key: "{{ .Values.outline.database.databaseHost.existingSecretKey }}" - name: DATABASE_URL value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@postgresql-{{ .Release.Name }}-cluster-rw:5432/$(POSTGRES_DATABASE_NAME)" - name: DATABASE_URL_TEST From 7d8c554354827c51014f4a920bd89539c1a54692 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 14 Mar 2024 08:59:18 -0600 Subject: [PATCH 13/13] change ingress and port name --- charts/outline/Chart.yaml | 2 +- charts/outline/templates/ingress.yaml | 8 ++++---- charts/outline/templates/service.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/outline/Chart.yaml b/charts/outline/Chart.yaml index 66c8da7..157f22e 100644 --- a/charts/outline/Chart.yaml +++ b/charts/outline/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: outline -version: 0.0.4 +version: 0.0.5 description: Chart for Outline wiki keywords: - wiki diff --git a/charts/outline/templates/ingress.yaml b/charts/outline/templates/ingress.yaml index 40c09d8..8537709 100644 --- a/charts/outline/templates/ingress.yaml +++ b/charts/outline/templates/ingress.yaml @@ -2,14 +2,14 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: outline-web + name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: outline-web + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web - app.kubernetes.io/part-of: outline + app.kubernetes.io/part-of: {{ .Release.Name }} annotations: {{- toYaml .Values.ingress.annotations | nindent 4 }} spec: @@ -26,7 +26,7 @@ spec: pathType: Prefix backend: service: - name: outline-web + name: {{ .Release.Name }} port: name: web {{- end }} diff --git a/charts/outline/templates/service.yaml b/charts/outline/templates/service.yaml index 9723490..528b03e 100644 --- a/charts/outline/templates/service.yaml +++ b/charts/outline/templates/service.yaml @@ -1,14 +1,14 @@ apiVersion: v1 kind: Service metadata: - name: outline-web + name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: outline-web + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web - app.kubernetes.io/part-of: outline + app.kubernetes.io/part-of: {{ .Release.Name }} spec: type: ClusterIP ports: @@ -17,5 +17,5 @@ spec: protocol: TCP name: web selector: - app.kubernetes.io/name: outline-web + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}