Update OpenSearch configuration and enhance database initialization in Helm chart

- Updated OpenSearch Docker image version from 3 to 3.3.2 in questions.yml and values.yaml.
- Renamed 'opensearch_url' to 'opensearch_remote_url' and added new fields for 'opensearch_remote_username' and 'opensearch_remote_password' in questions.yml and values.yaml to improve remote setup support.
- Adjusted app-env.yaml and pi-common-env.yaml to use the new remote URL and credentials for OpenSearch.
- Modified PostgreSQL initialization SQL to ensure database names are quoted correctly for compatibility.
- Removed obsolete postgres-init.yaml template to streamline configuration.

Author: akshat5302

charts/plane-enterprise/questions.yml

@@ -1078,7 +1078,7 @@ questions:
   - variable: services.opensearch.image
     label: "Docker Image"
     type: string
-    default: "opensearchproject/opensearch:3"
+    default: "opensearchproject/opensearch:3.3.2"
     show_if: "services.opensearch.local_setup=true"
   - variable: services.opensearch.pullPolicy
     label: "OpenSearch Pull Policy"
@@ -1114,16 +1114,26 @@ questions:
     type: boolean
     default: false
     show_if: "services.opensearch.local_setup=true"
-  - variable: env.opensearch_url
-    label: "Remote URL"
+  - variable: env.opensearch_remote_url
+    label: "OpenSearch Remote URL"
+    type: string
+    default: ""
+    show_if: "services.opensearch.local_setup=false"
+  - variable: env.opensearch_remote_username
+    label: "OpenSearch Remote Username"
     type: string
     default: ""
     show_if: "services.opensearch.local_setup=false"
+  - variable: env.opensearch_remote_password
+    label: "OpenSearch Remote Password"
+    type: password
+    default: ""
+    show_if: "services.opensearch.local_setup=false"
   - variable: env.opensearch_index_prefix
     label: "Index Prefix"
     type: string
     default: ""
-  - variable: env.opensearch_ml_model_id
+  - variable: env.pi_envs.opensearch_ml_model_id
     label: "ML Model ID"
     type: string
     default: ""

charts/plane-enterprise/templates/config-secrets/app-env.yaml

@@ -39,8 +39,8 @@ stringData:
 
   {{- if .Values.services.opensearch.local_setup }}
   OPENSEARCH_PASSWORD: {{ .Values.services.opensearch.password | default "Secure@Pass#123!%^&*" | quote }}
-  {{- else if .Values.env.opensearch_url }}
-  OPENSEARCH_PASSWORD: {{ .Values.services.opensearch.password | default "" | quote }}
+  {{- else if .Values.env.opensearch_remote_url }}
+  OPENSEARCH_PASSWORD: {{ .Values.env.opensearch_remote_password | default "" | quote }}
   {{- else }}
   OPENSEARCH_PASSWORD: ""
   {{- end }}
@@ -93,10 +93,10 @@ data:
   OPENSEARCH_URL: "http://{{ .Release.Name }}-opensearch.{{ .Release.Namespace }}.svc.cluster.local:9200"
   OPENSEARCH_USERNAME: {{ .Values.services.opensearch.username | default "plane" |  quote }}
   OPENSEARCH_INDEX_PREFIX: {{ .Values.env.opensearch_index_prefix | default "" | quote }}
-  {{- else if .Values.env.opensearch_url }}
+  {{- else if .Values.env.opensearch_remote_url }}
   OPENSEARCH_ENABLED: "1"
-  OPENSEARCH_URL: {{ .Values.env.opensearch_url | quote }}
-  OPENSEARCH_USERNAME: {{ .Values.services.opensearch.username | default "" |  quote }}
+  OPENSEARCH_URL: {{ .Values.env.opensearch_remote_url | quote }}
+  OPENSEARCH_USERNAME: {{ .Values.env.opensearch_remote_username | default "" |  quote }}
   OPENSEARCH_INDEX_PREFIX: {{ .Values.env.opensearch_index_prefix | default "" | quote }}
   {{- else }}
   OPENSEARCH_ENABLED: "0"

charts/plane-enterprise/templates/config-secrets/pgdb.yaml

@@ -24,14 +24,14 @@ data:
   init-dbs.sql: |
     CREATE EXTENSION IF NOT EXISTS dblink;
 
-    SELECT 'CREATE DATABASE {{.Values.env.pgdb_name}}'
+    SELECT 'CREATE DATABASE "{{.Values.env.pgdb_name}}"'
     WHERE NOT EXISTS (
-        SELECT FROM pg_database WHERE datname = '{{.Values.env.pgdb_name}}'
+        SELECT FROM pg_database WHERE datname = '"{{.Values.env.pgdb_name}}"'
     )\gexec
     
-    SELECT 'CREATE DATABASE {{.Values.env.pg_pi_db_name}}'
+    SELECT 'CREATE DATABASE "{{.Values.env.pg_pi_db_name}}"'
     WHERE NOT EXISTS (
-        SELECT FROM pg_database WHERE datname = '{{.Values.env.pg_pi_db_name}}'
+        SELECT FROM pg_database WHERE datname = '"{{.Values.env.pg_pi_db_name}}"'
     )\gexec
 
 {{- end }}

charts/plane-enterprise/templates/config-secrets/pi-common-env.yaml

@@ -21,8 +21,8 @@ stringData:
   {{- end }}
   {{- if .Values.services.opensearch.local_setup }}
   OPENSEARCH_PASSWORD: {{ .Values.services.opensearch.password | default "Secure@Pass#123!%^&*" | quote }}
-  {{- else if .Values.env.opensearch_url }}
-  OPENSEARCH_PASSWORD: {{ .Values.services.opensearch.password | default "" | quote }}
+  {{- else if .Values.env.opensearch_remote_url }}
+  OPENSEARCH_PASSWORD: {{ .Values.env.opensearch_remote_password | default "" | quote }}
   {{- else }}
   OPENSEARCH_PASSWORD: ""
   {{- end }}
@@ -38,16 +38,16 @@ data:
   OPENSEARCH_URL: "http://{{ .Release.Name }}-opensearch.{{ .Release.Namespace }}.svc.cluster.local:9200"
   OPENSEARCH_USER: {{ .Values.services.opensearch.username | default "plane" |  quote }}
   OPENSEARCH_INDEX_PREFIX: {{ .Values.env.opensearch_index_prefix | default "" | quote }}
-  {{- else if .Values.env.opensearch_url }}
-  OPENSEARCH_URL: {{ .Values.env.opensearch_url | quote }}
-  OPENSEARCH_USER: {{ .Values.services.opensearch.username | default "" |  quote }}
+  {{- else if .Values.env.opensearch_remote_url }}
+  OPENSEARCH_URL: {{ .Values.env.opensearch_remote_url | quote }}
+  OPENSEARCH_USER: {{ .Values.env.opensearch_remote_username | default "" |  quote }}
   OPENSEARCH_INDEX_PREFIX: {{ .Values.env.opensearch_index_prefix | default "" | quote }}
   {{- else }}
   OPENSEARCH_URL: ""
   OPENSEARCH_USER: ""
   OPENSEARCH_INDEX_PREFIX: ""
   {{- end }}
-  OPENSEARCH_ML_MODEL_ID: {{ .Values.env.opensearch_ml_model_id | default "" |  quote }}
+  OPENSEARCH_ML_MODEL_ID: {{ .Values.env.pi_envs.opensearch_ml_model_id | default "" |  quote }}
 
   CELERY_VECTOR_SYNC_ENABLED: {{ .Values.env.pi_envs.celery.vector_sync_enabled | ternary "1" "0" | quote }}
   CELERY_VECTOR_SYNC_INTERVAL: {{ .Values.env.pi_envs.celery.vector_sync_interval | default 3 | quote }}

charts/plane-enterprise/templates/config-secrets/postgres-init.yaml

@@ -86,7 +86,3 @@ spec:
 
 ---
 {{- end }}
-
-
-
-

charts/plane-enterprise/templates/workloads/pi-api.deployment.yaml

@@ -55,7 +55,3 @@ spec:
       serviceAccountName: {{ .Release.Name }}-srv-account
 ---
 {{- end }}
-
-
-
-

charts/plane-enterprise/templates/workloads/pi-beat.deployment.yaml

@@ -44,7 +44,3 @@ spec:
 
 ---
 {{- end }}
-
-
-
-

charts/plane-enterprise/templates/workloads/pi-migrator.job.yaml

@@ -82,7 +82,7 @@ services:
 
   opensearch:
     local_setup: true
-    image: opensearchproject/opensearch:3
+    image: opensearchproject/opensearch:3.3.2
     servicePort: 9200
     volumeSize: 5Gi
     pullPolicy: IfNotPresent
@@ -419,9 +419,10 @@ env:
   use_storage_proxy: false
 
   #OPENSEARCH ENVS
-  opensearch_url: ''
+  opensearch_remote_url: ''
+  opensearch_remote_username: ''
+  opensearch_remote_password: ''
   opensearch_index_prefix: ''
-  opensearch_ml_model_id: ''
 
   #API KEYS
   secret_key: "60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5"
@@ -485,6 +486,8 @@ env:
     cors_allowed_origins: ''
     cohere_api_key: ''
     internal_secret: 'tyfvfqvBJAgpm9bzvf3r4urJer0Ehfdubk'
+    opensearch_ml_model_id: ''
+
 
     celery:
       vector_sync_enabled: false