Standartize the persistent volume variables

Flagro · Mar 2, 2024 · 5e9f30c · 5e9f30c
1 parent fa09795
commit 5e9f30c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/helm/templates/db_pv.yaml b/helm/templates/db_pv.yaml
@@ -8,8 +8,8 @@ spec:
   capacity:
     storage: {{ .Values.pv.dbPv.storageRequest }}
   accessModes:
-    - {{ .Values.pv.dbPv.accessModes }}
-  persistentVolumeReclaimPolicy: {{ .Values.pv.dbPv.reclaimPolicy }}
-  storageClassName: {{ .Values.pv.dbPv.storageClass }}
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: standard
   hostPath:
     path: {{ .Values.pv.dbPv.hostPath | quote }}
diff --git a/helm/templates/db_pvc.yaml b/helm/templates/db_pvc.yaml
@@ -10,4 +10,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.pvc.dbPvc.storageRequest | quote }}
-  storageClassName: {{ .Values.pvc.dbPvc.storageClass | quote }}
+  storageClassName: standard
diff --git a/helm/templates/web_pv.yaml b/helm/templates/web_pv.yaml
@@ -8,8 +8,8 @@ spec:
   capacity:
     storage: {{ .Values.pv.staticPv.storageRequest }}
   accessModes:
-    - {{ .Values.pv.staticPv.accessModes }}
-  persistentVolumeReclaimPolicy: {{ .Values.pv.staticPv.reclaimPolicy }}
-  storageClassName: {{ .Values.pv.staticPv.storageClass }}
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: standard
   hostPath:
     path: {{ .Values.pv.staticPv.hostPath | quote }}
diff --git a/helm/templates/web_pvc.yaml b/helm/templates/web_pvc.yaml
@@ -10,4 +10,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.pvc.staticPvc.storageRequest | quote }}
-  storageClassName: {{ .Values.pvc.staticPvc.storageClass | quote }}
+  storageClassName: standard
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -23,8 +23,6 @@ backendService:
   type: ClusterIP
 dbConfig:
   postgresHost: phrinifluent-db-service
-  postgresName: postgres
-  postgresPort: "5432"
 dbDeployment:
   phrinifluentDb:
     image:
@@ -56,22 +54,14 @@ nginxDeployment:
 pv:
   dbPv:
     storageRequest: 5Gi
-    storageClass: standard
-    reclaimPolicy: Retain
-    accessModes: ReadWriteOnce
     hostPath: /var/lib/docker/volumes/phrinifluent-db-pv/_data
   staticPv:
     storageRequest: 2Gi
-    storageClass: standard
-    reclaimPolicy: Retain
-    accessModes: ReadWriteMany
     hostPath: /var/lib/docker/volumes/phrinifluent-static-pv/_data
 pvc:
   dbPvc:
-    storageClass: standard
     storageRequest: 5Gi
   staticPvc:
-    storageClass: standard
     storageRequest: 2Gi
 staticService:
   ports: