inject db secrets into deployment

.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"
         }
     ]
 }

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

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

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:
       - ""

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

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"

charts/outline/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: outline
-version: 0.0.2
+version: 0.0.4
 description: Chart for Outline wiki
 keywords:
   - wiki

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
@@ -91,12 +97,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
@@ -116,7 +147,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 }}"

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

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

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 }}"