Merge pull request #53 from RuliXu/add-pg-dsn

Add PG DSN
clusterpedia-io · Jul 17, 2023 · d75d05e · d75d05e
2 parents 53c40cb + 1121d8e
commit d75d05e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/charts/clusterpedia/Chart.yaml b/charts/clusterpedia/Chart.yaml
@@ -15,7 +15,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: 1.7.1
+version: 1.7.2
 
 # 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

diff --git a/charts/clusterpedia/README.md b/charts/clusterpedia/README.md
@@ -279,4 +279,4 @@ rm /var/local/clusterpedia/internalstorage/<storage type>
 | controllerManager.tolerations | list | `[]` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
+Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
diff --git a/charts/clusterpedia/templates/_helpers.tpl b/charts/clusterpedia/templates/_helpers.tpl
@@ -127,8 +127,10 @@ Return the proper Docker Image Registry Secret Names
 {{- if not (empty .Values.externalStorage.dsn) -}}
      {{- if eq .Values.externalStorage.type "mysql" }}
          {{- .Values.externalStorage.dsn }}
+     {{- else if eq (include "clusterpedia.storage.type" .) "postgres" -}}
+         {{- .Values.externalStorage.dsn }}
      {{- else -}}
-         {{ required "storage dsn only supports mysql" "" }}
+         {{ required "storage dsn only supports mysql or postgres" "" }}
      {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -149,7 +151,7 @@ Return the proper Docker Image Registry Secret Names
           {{- else -}}
                {{- "postgres" -}}
           {{- end -}}
-               {{- else if eq (include "clusterpedia.storage.type" .) "mysql" -}}
+     {{- else if eq (include "clusterpedia.storage.type" .) "mysql" -}}
           {{- if not (empty .Values.mysql.auth.username) -}}
                {{- .Values.mysql.auth.username -}}
           {{- else -}}

diff --git a/charts/clusterpedia/templates/scripts-configmap.yaml b/charts/clusterpedia/templates/scripts-configmap.yaml
@@ -47,6 +47,35 @@ data:
         echo "user=\"$user\""
         echo "password=\"$password\""
     }
+    
+    function parse_postgres_dsn() {
+        local dsn=$1
+        if [ -z $dsn ]
+        then
+            return
+        fi
+
+        kvpairs=($dsn)
+        for kv in "${kvpairs[@]}"; do
+            if [[ $kv == "host"* ]]; then
+            IFS='=' read -r -a _kv <<< $kv; host=${_kv[1]}
+            fi
+            if [[ $kv == "user"* ]]; then
+            IFS='=' read -r -a _kv <<< $kv; user=${_kv[1]}
+            fi
+            if [[ $kv == "port"* ]]; then
+            IFS='=' read -r -a _kv <<< $kv; port=${_kv[1]}
+            fi
+            if [[ $kv == "dbname"* ]]; then
+            IFS='=' read -r -a _kv <<< $kv; database=${_kv[1]}
+            fi
+        done
+    
+        echo "database=\"$database\""
+        echo "host=\"$host\""
+        echo "port=\"$port\""
+        echo "user=\"$user\""
+    }
 
     function create_variables() {
         local yaml_file="$1"
@@ -56,4 +85,9 @@ data:
         then
             eval $(parse_mysql_dsn "$dsn")
         fi
+    
+        if [ $type == "postgres" ]
+        then
+            eval $(parse_postgres_dsn "$dsn")
+        fi
     }