Merge pull request #220 from 3dwardch3ng/app/postgresql

fix pvc and fix values

kubernetes/apps/postgresql/app/pvc.yaml

@@ -6,14 +6,20 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual
+  storageClassName: local-path
+  volumeMode: Filesystem
   capacity:
     storage: 8Gi
   accessModes:
     - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
-  hostPath:
+  local:
     path: "/mnt/nfs/AppData/postgresql/primary"
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: postgresql-primary-pvc
+    namespace: postgresql
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -23,7 +29,8 @@ metadata:
   labels:
     name: postgresql-primary-pvc
 spec:
-  storageClassName: manual
+  storageClassName: local-path
+  volumeMode: Filesystem
   accessModes:
     - ReadWriteOnce
   resources:
@@ -38,14 +45,20 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual
+  storageClassName: local-path
+  volumeMode: Filesystem
   capacity:
     storage: 8Gi
   accessModes:
     - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
-  hostPath:
+  local:
     path: "/mnt/nfs/AppData/postgresql/replica"
+  claimRef:
+    apiVersion: v1
+    kind: PersistentVolumeClaim
+    name: postgresql-replica-pvc
+    namespace: postgresql
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -55,7 +68,8 @@ metadata:
   labels:
     name: postgresql-replica-pvc
 spec:
-  storageClassName: manual
+  storageClassName: local-path
+  volumeMode: Filesystem
   accessModes:
     - ReadWriteOnce
   resources:

kubernetes/apps/postgresql/app/release.yaml

@@ -41,42 +41,42 @@ spec:
     remediation:
       retries: 3
   values:
-    postgresql:
+    global:
       auth:
         postgresPassword: ${postgresql_password}
         username: ${username}
         password: ${password}
         database: ${database}
         replicationPassword: ${replication_password}
-      architecture: "replication"
+    architecture: "replication"
-      replication:
+    replication:
-        synchronousCommit: "on"
+      synchronousCommit: "on"
-        numSynchronousReplicas: 1
+      numSynchronousReplicas: 1
-        applicationName: "postgresqlReplication"
+      applicationName: "postgresqlReplication"
-      primary:
+    primary:
-        podSecurityContext:
+      podSecurityContext:
-          fsGroup: 1000
+        fsGroup: 1000
-        containerSecurityContext:
+      containerSecurityContext:
-          runAsUser: 1000
+        runAsUser: 1000
-          runAsGroup: 1000
+        runAsGroup: 1000
-        podLabels:
+      podLabels:
-          name: "postgresql-primary"
+        name: "postgresql-primary"
-        persistence:
+      persistence:
-          existingClaim: postgresql-primary-pvc
+        existingClaim: postgresql-primary-pvc
-          selector:
+        selector:
-            matchLabels:
+          matchLabels:
-              name: postgresql-primary-pvc
+            name: postgresql-primary-pvc
-      readReplicas:
+    readReplicas:
-        name: "replica"
+      name: "replica"
-        podSecurityContext:
+      podSecurityContext:
-          fsGroup: 1000
+        fsGroup: 1000
-        containerSecurityContext:
+      containerSecurityContext:
-          runAsUser: 1000
+        runAsUser: 1000
-          runAsGroup: 1000
+        runAsGroup: 1000
-        podLabels:
+      podLabels:
-          name: "postgresql-replica"
+        name: "postgresql-replica"
-        persistence:
+      persistence:
-          existingClaim: postgresql-replica-pvc
+        existingClaim: postgresql-replica-pvc
-          selector:
+        selector:
-            matchLabels:
+          matchLabels:
-              name: postgresql-replica-pvc
+            name: postgresql-replica-pvc