[postgresql-cnpg] change from bootstrap init db to database (#177)

Author: ihiverlet

charts/postgresql-cnpg/Chart.yaml

@@ -11,7 +11,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/postgresql-cnpg/templates/NOTES.txt

@@ -109,4 +109,4 @@ print(dbGetQuery(conn, "SELECT version();"))
 dbDisconnect(conn)
 ```
 </details>
-{{- end -}}
+{{- end -}}

charts/postgresql-cnpg/templates/_helpers.tpl

@@ -29,4 +29,3 @@ Create chart name and version as used by the chart label.
 {{- define "postgres-cnpg.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
-

charts/postgresql-cnpg/templates/cluster.yaml

@@ -15,28 +15,20 @@ spec:
     kind: ClusterImageCatalog
     name: {{ .Values.imageCatalog.name }}
     major: {{ .Values.imageCatalog.major }}
-  {{ if .Values.extension.pgvector }}
-  extensions:
-    - name: vector
-  {{- end }}
-
   storage:
-    size: {{ .Values.storage.size }} 
-  
+    size: {{ .Values.storage.size }}
   resources:
     {{- toYaml .Values.resources | nindent 4 }}
-
-  bootstrap:
-    initdb:
-      database: {{ .Values.auth.database }}
-      owner: {{ .Values.auth.username }}
-      secret:
-        name: {{ include "postgres-cnpg.fullname" . }}
-
   enableSuperuserAccess: true
   superuserSecret:
     name: {{ include "postgres-cnpg.fullname" . }}-superuser
-
   managed:
+    roles:
+    - name: {{ .Values.auth.username }}
+      ensure: present
+      login: true
+      superuser: false
+      passwordSecret:
+        name: {{ include "postgres-cnpg.fullname" . }}-user
     services:
       disabledDefaultServices: ["ro"]

charts/postgresql-cnpg/templates/database.yaml

@@ -0,0 +1,15 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: {{ include "postgres-cnpg.fullname" . }}
+spec:
+  name: {{ .Values.auth.database }}
+  owner: {{ .Values.auth.username }}
+  cluster:
+    name: {{ include "postgres-cnpg.fullname" . }}
+  {{ if .Values.extension.pgvector }}
+  extensions:
+    - name: vector
+  {{- end }}
+
+

charts/postgresql-cnpg/templates/discovery-secret.yaml

@@ -13,4 +13,4 @@ data:
   postgres-username: {{ .Values.auth.username | default ".Values.auth.username"  | b64enc | quote }}
   postgres-database: {{ .Values.auth.database | default ".Values.auth.database" | b64enc | quote }}
   postgres-port: {{ (index .Values.ports 0).port | quote }}
-{{- end -}}
+{{- end -}}

…sql-cnpg/templates/superuser-secret.yaml …sql-cnpg/templates/secret-superuser.yamlcharts/postgresql-cnpg/templates/superuser-secret.yaml renamed to charts/postgresql-cnpg/templates/secret-superuser.yaml charts/postgresql-cnpg/templates/superuser-secret.yaml renamed to charts/postgresql-cnpg/templates/secret-superuser.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "postgres-cnpg.fullname" . }}-user
+type: kubernetes.io/basic-auth
+data:
+  username: {{ .Values.auth.username | default ".Values.auth.username"  | b64enc | quote }}
+  password: {{ .Values.auth.password | default ".Values.auth.password"  | b64enc | quote }}

charts/postgresql-cnpg/templates/secret-user.yaml

@@ -237,4 +237,4 @@
             }
         }
     }
-}
+}

charts/postgresql-cnpg/values.schema.json

@@ -36,4 +36,4 @@ userPreferences:
   language: en
 
 discovery:
-  enabled: false
+  enabled: false