chore(postgresql-cluster): bind info

EamonZhang · EamonZhang · commit 9e6a085f6dd7 · 2023-12-12T09:52:18.000+08:00
diff --git a/addons/postgresql-cluster/15/chart/postgresql-cluster/README.md b/addons/postgresql-cluster/15/chart/postgresql-cluster/README.md
@@ -1,5 +1,46 @@
-## CREATE PG INSTANCE
 
+#   Postgresql cluster addons 
+## Plans
+
+View and choose the service resource specifications you need.
+```
+ # drycc resources:plans postgresql-cluster 
+```
+### Resource specification list
+| Resource Specification | Cores | MEMORY | Storage SIZE |
+| :---: | :---: | :---: | :---: | 
+| standard-10 | 1C | 2G | 10G |  
+| standard-20 | 2C | 4G | 20G | 
+| standard-50 | 2C | 8G | 50G | 
+| standard-100 | 4C | 16G | 100G |  
+| standard-200 | 8C | 32G | 200G |  
+| standard-400 | 16C | 64G | 400G | 
+| standard-800 | 32C | 128G | 800G | 
+
+In order to obtain a better experience, it is recommended not to exceed 80% usage of resource utilization for a long period of time. If there is a need for larger resource scale, please apply for private customization.
+
+## Create Postgresql Cluster Service instance
+
+- Create Postgresql service
+```
+#  drycc resources:create postgresql-cluster:standard-10 `my_pg_001`
+```
+- View service status 
+```
+# drycc resources:descript `my_pg_001`
+``` 
+- Bind service
+```
+# drycc resources:bind `my_pg_001`
+```
+- View resource status 
+```
+# drycc resources:descript `my_pg_001`
+``` 
+
+## Create Service with parameters
+
+`vim value.yaml`  
 ```
 #  create or update pg instance template yaml
 networkPolicy.allowNamespaces:
@@ -14,14 +55,21 @@ backup:
   Amount of base backups to retain
   retainBackups: 2
   s3:
-    awsAccessKeyID: DO9l771LqiwZkhhz
-    awsSecretAccessKey: R3Dv0NEmJBo8JFdn1q8jz49ArWwpDjFn
-    walGS3Prefix: mx-test
+    awsAccessKeyID: ""
+    awsSecretAccessKey: ""
+    walGS3Prefix: "s3://xx"
+    awsEndpoint: "http://xxxx:9000"
+    awsS3ForcePathStyle: "true"
+    awsRegion: dx-1
+```
+```
+ drycc resources:create postgresql-cluster:standard-10 `my_pg_001` -f ./value.yaml
 ```
 
-## Create app user and database
+## Update Service 
+###  Create app user and database
 
-- Login PG with admin user & password
+- Login database web with admin user & password
 
 - CREATE APP USER
 ```
@@ -36,28 +84,44 @@ CREATE DATABASE `my_db` OWNER `my_user`;
 CREATE EXTENSION pg_buffercache;
 ```
 
-## Network Access
+### Network Access 
 
 Default access allow policy: only namespace scope.
 
 - allow `mx-test1` namespace access 
+
+`vim value.yaml `
 ```
 networkPolicy.allowNamespaces:
  - mx-test1 
 ```
+```
+drycc resources:update postgresql-cluster:standard-10  `my_pg_001` -f ./value.yaml
+```
+
+ - Assign external network IP address 
 
- - Assign external network IP address
+`vim value.yaml`
+``` 
+ service.type: LoadBlancer
 ```
- service.type: LoadBlance
 ```
+drycc resources:update postgresql-cluster:standard-10 `my_pg_001` -f ./value.yaml
+```
+- View resource status 
+```
+# drycc resources:describe  `my_pg_001`
+``` 
 
- ## Manger backup your data `Very important`
+ ### Manger backup your data `Very important`
  
 `Strongly recommend enabling this feature.`
 `Strongly recommend enabling this feature.`
 `Strongly recommend enabling this feature.`
 
 PG data backup use S3 as backenp store. Choose an independent storage space `outside of the current environment` as your backup space.
+
+`vim value.yaml`
 ```
 backup:
   # whether BackUP should be enabled
@@ -71,20 +135,20 @@ backup:
     awsSecretAccessKey: R3Dv0NEmJBo8JFdn1q8jz49ArWwpDjFn
     walGS3Prefix: mx-test
 ```
+```
+drycc resources:update postgresql-cluster:standard-10 `my_pg_001` -f ./value.yaml
+```
 
-You can modify multiple content at once, there is no need to modify part of it each time.
+You can modify multiple content at once, there is no need to modify part of it each time. 
 
-## Plans
 
-| Resource Specification | Cores | MEMORY | Storage SIZE |
-| :---: | :---: | :---: | :---: | 
-| standard-10 | 1C | 2G | 10G |  
-| standard-20 | 2C | 4G | 20G | 
-| standard-50 | 2C | 8G | 50G | 
-| standard-100 | 4C | 16G | 100G |  
-| standard-200 | 8C | 32G | 200G |  
-| standard-400 | 16C | 64G | 400G | 
-| standard-800 | 32C | 128G | 800G | 
-
-In order to obtain a better experience, it is recommended not to exceed 80% usage of resource utilization for a long period of time. If there is a need for larger resource scale, please apply for private customization.
+## Destroy Service
 
+- Unbind service first
+```
+# drycc resources:unbind `my_pg_001`
+```
+- Destroy service
+```
+# drycc resources:destroy `my_pg_001`
+```
diff --git a/addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml b/addons/postgresql-cluster/15/chart/postgresql-cluster/templates/statefulset.yaml
@@ -108,7 +108,7 @@ spec:
           name: postgresql-config
           # readOnly: true
         - mountPath: "/opt/drycc/postgresql/backup/"
-          name: postgresql-backup
+          name: backup-config
           # readOnly: true
         resources:
 {{ toYaml .Values.resources | indent 10 }}
@@ -127,7 +127,7 @@ spec:
         {{- end }}
         env:
           - name: DATA_SOURCE_NAME
-            value: {{ printf "postgresql://tea_mon:password@127.0.0.1:5432/%s?sslmode=disable" $.Values.database.dbname }}       
+            value: {{ printf "postgresql://tea_mon:password@127.0.0.1:5432/postgres?sslmode=disable" }}       
         ports:
           - name: http-metrics
             containerPort: {{ .Values.metrics.containerPort }}
@@ -221,7 +221,7 @@ spec:
       - name: postgresql-config
         configMap:
           name: {{ template "common.names.fullname" . }}-postgresql
-      - name: archive-config
+      - name: backup-config
         configMap:
           name: {{ template "common.names.fullname" . }}-backup
       {{- if not .Values.persistentVolume.enabled }}
diff --git a/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml b/addons/postgresql-cluster/15/chart/postgresql-cluster/values.yaml
@@ -3,7 +3,8 @@ diagnosticMode:
   enable: false
 
 service:
- type: ClusterIP
+ # ClusterIP LoadBalancer
+ type: LoadBalancer
 
 image:
   # Image was built from registry.drycc.cc/drycc-addons/patroni:3.2
@@ -81,7 +82,7 @@ preInitScript: |
           track_commit_timestamp: "off"
           archive_mode: "on"
           archive_timeout: 300s
-          archive_command: sh /opt/drycc/postgresql/walbackup.sh %p %p
+          archive_command: sh /opt/drycc/postgresql/walbackup.sh %p
           # timescaledb.license: 'timescale'
           shared_preload_libraries: 'auto_explain,pg_stat_statements'
           log_destination: 'csvlog'
@@ -201,7 +202,7 @@ patroni:
 ## Postgresql Prometheus exporter parameters
 ##
 metrics:
-  enabled: false 
+  enabled: true 
   image:
     repository: registry.drycc.cc/drycc-addons/postgres-exporter
     tag: "0"
@@ -248,15 +249,15 @@ metrics:
     limits:
       cpu: 100m
       memory: 512Mi
-      hugepages-2Mi: 20Mi
+      # hugepages-2Mi: 20Mi
     requests:
       cpu: 100m
       memory: 512Mi
 backup:
   # Specifies whether Wal-G should be enabled
-  enabled: false
+  enabled: true
   # Cron schedule for doing base backups
-  scheduleCronJob: "20 0 * * 0"
+  scheduleCronJob: "22 0 * * 0"
   # Amount of base backups to retain
   retainBackups: 2
   # Name of the secret that holds the credentials to the bucket
@@ -351,5 +352,4 @@ networkPolicy:
   ## (with the correct destination port).
   ##
   allowCurrentNamespace: true
-  allowNamespaces: 
-    - mx-test1
+  allowNamespaces: 
diff --git a/addons/postgresql-cluster/15/plans/standard-10/bind.yaml b/addons/postgresql-cluster/15/plans/standard-10/bind.yaml
@@ -1,16 +1,16 @@
 credential:
 {{- if (eq .Values.service.type "LoadBalancer") }}
-  - name: MASTER_HOST
+  - name: EXTRANET_MASTER_HOST
     valueFrom:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-master
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  - name: REPL_HOST
+  - name: EXTRANET_REPL_HOST
     valueFrom:
       serviceRef:
         name: {{ template "common.names.fullname" . }}-repl
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  {{- else if (eq .Values.service.type "ClusterIP") }}
+ {{- end }}
   - name: MASTER_HOST
     valueFrom:
       serviceRef:
@@ -21,7 +21,6 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
   - name: DADABASE
     valueFrom:
       secretKeyRef:
@@ -38,5 +37,4 @@ credential:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.data-user }' 
   - name: PORT
-    value: 5432
-
+    value: 5432
diff --git a/addons/postgresql-cluster/15/plans/standard-100/bind.yaml b/addons/postgresql-cluster/15/plans/standard-100/bind.yaml
@@ -1,16 +1,16 @@
 credential:
 {{- if (eq .Values.service.type "LoadBalancer") }}
-  - name: MASTER_HOST
+  - name: EXTRANET_MASTER_HOST
     valueFrom:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-master
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  - name: REPL_HOST
+  - name: EXTRANET_REPL_HOST
     valueFrom:
       serviceRef:
         name: {{ template "common.names.fullname" . }}-repl
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  {{- else if (eq .Values.service.type "ClusterIP") }}
+ {{- end }}
   - name: MASTER_HOST
     valueFrom:
       serviceRef:
@@ -21,7 +21,6 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
   - name: DADABASE
     valueFrom:
       secretKeyRef:
diff --git a/addons/postgresql-cluster/15/plans/standard-20/bind.yaml b/addons/postgresql-cluster/15/plans/standard-20/bind.yaml
@@ -1,16 +1,16 @@
 credential:
 {{- if (eq .Values.service.type "LoadBalancer") }}
-  - name: MASTER_HOST
+  - name: EXTRANET_MASTER_HOST
     valueFrom:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-master
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  - name: REPL_HOST
+  - name: EXTRANET_REPL_HOST
     valueFrom:
       serviceRef:
         name: {{ template "common.names.fullname" . }}-repl
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  {{- else if (eq .Values.service.type "ClusterIP") }}
+ {{- end }}
   - name: MASTER_HOST
     valueFrom:
       serviceRef:
@@ -21,7 +21,6 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
   - name: DADABASE
     valueFrom:
       secretKeyRef:
diff --git a/addons/postgresql-cluster/15/plans/standard-200/bind.yaml b/addons/postgresql-cluster/15/plans/standard-200/bind.yaml
@@ -1,16 +1,16 @@
 credential:
 {{- if (eq .Values.service.type "LoadBalancer") }}
-  - name: MASTER_HOST
+  - name: EXTRANET_MASTER_HOST
     valueFrom:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-master
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  - name: REPL_HOST
+  - name: EXTRANET_REPL_HOST
     valueFrom:
       serviceRef:
         name: {{ template "common.names.fullname" . }}-repl
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  {{- else if (eq .Values.service.type "ClusterIP") }}
+ {{- end }}
   - name: MASTER_HOST
     valueFrom:
       serviceRef:
@@ -21,7 +21,6 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
   - name: DADABASE
     valueFrom:
       secretKeyRef:
diff --git a/addons/postgresql-cluster/15/plans/standard-400/bind.yaml b/addons/postgresql-cluster/15/plans/standard-400/bind.yaml
@@ -1,16 +1,16 @@
 credential:
 {{- if (eq .Values.service.type "LoadBalancer") }}
-  - name: MASTER_HOST
+  - name: EXTRANET_MASTER_HOST
     valueFrom:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-master
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  - name: REPL_HOST
+  - name: EXTRANET_REPL_HOST
     valueFrom:
       serviceRef:
         name: {{ template "common.names.fullname" . }}-repl
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  {{- else if (eq .Values.service.type "ClusterIP") }}
+ {{- end }}
   - name: MASTER_HOST
     valueFrom:
       serviceRef:
@@ -21,8 +21,7 @@ credential:
       serviceRef:
         name: {{ include "common.names.fullname" . }}-repl
         jsonpath: '{ .spec.clusterIP }'
-  {{- end }}
-  - name: DATABASE
+  - name: DADABASE
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}
diff --git a/addons/postgresql-cluster/15/plans/standard-50/bind.yaml b/addons/postgresql-cluster/15/plans/standard-50/bind.yaml
diff --git a/addons/postgresql-cluster/15/plans/standard-800/bind.yaml b/addons/postgresql-cluster/15/plans/standard-800/bind.yaml
