More changes for mySQL container

CAAPIM · Feb 18, 2025 · 5db1d22 · 5db1d22
1 parent d1adbbb
commit 5db1d22
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/charts/druid/templates/coordinator/coordinator-config.yaml b/charts/druid/templates/coordinator/coordinator-config.yaml
@@ -15,7 +15,7 @@ data:
   MINIO_BUCKET: {{ .Values.minio.bucketName }}
   DATABASE_TYPE: {{ required "Please fill in databaseType in values.yaml" .Values.global.databaseType | quote }}
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/druid/templates/ingestion/ingestion-config.yaml b/charts/druid/templates/ingestion/ingestion-config.yaml
@@ -20,7 +20,7 @@ data:
   PARTITION_COUNT: "{{ .Values.ingestion.config.partitionCount }}"
   REPLICATION_COUNT: "{{ .Values.kafka.replicaCount }}"
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/charts/druid-1.0.15.tgz b/charts/portal/charts/druid-1.0.15.tgz
diff --git a/charts/portal/templates/analytics-server/analytics-config.yaml b/charts/portal/templates/analytics-server/analytics-config.yaml
@@ -12,7 +12,7 @@ data:
   BROKER_PORT: "8082"
   ANALYTICS_ENABLED: {{ .Values.portal.analytics.enabled | quote }}
   {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/templates/apim/apim-config.yaml b/charts/portal/templates/apim/apim-config.yaml
@@ -9,7 +9,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/templates/authenticator/authenticator-config.yaml b/charts/portal/templates/authenticator/authenticator-config.yaml
@@ -11,7 +11,7 @@ data:
   CASSO_DEBUG_ENABLED: {{ required "Please fill in ssoDebug in values.yaml" .Values.portal.ssoDebug | quote}}
   CASSO_ENABLED: "true"
   {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/templates/jobs/db-upgrade-job.yaml b/charts/portal/templates/jobs/db-upgrade-job.yaml
@@ -35,7 +35,7 @@ spec:
           env:
            - name: HOST
          {{ if .Values.global.setupDemoDatabase }}
-             value: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+             value: {{ .Release.Name }}-headless
         {{ else }}
              value: {{ .Values.global.databaseHost | quote }}
         {{ end }}

diff --git a/charts/portal/templates/jobs/rbac-upgrade-job.yaml b/charts/portal/templates/jobs/rbac-upgrade-job.yaml
@@ -35,7 +35,7 @@ spec:
           env:
            - name: HOST
          {{ if .Values.global.setupDemoDatabase }}
-             value: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+             value: {{ .Release.Name }}-headless
         {{ else }}
              value: {{ .Values.global.databaseHost | quote }}
         {{ end }}

diff --git a/charts/portal/templates/portal-data/portal-data-config.yaml b/charts/portal/templates/portal-data/portal-data-config.yaml
@@ -9,8 +9,8 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
-  RBAC_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
+  RBAC_DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
   RBAC_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}

diff --git a/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml b/charts/portal/templates/portal-enterprise/portal-enterprise-config.yaml
@@ -9,9 +9,9 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ if .Values.global.setupDemoDatabase}}
-  ENTERPRISE_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
-  RBAC_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
-  SEARCH_DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  ENTERPRISE_DATABASE_HOST: {{ .Release.Name }}-headless
+  RBAC_DATABASE_HOST: {{ .Release.Name }}-headless
+  SEARCH_DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   ENTERPRISE_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
   RBAC_DATABASE_HOST: {{ .Values.global.databaseHost | quote }}

diff --git a/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml b/charts/portal/templates/tenant-provisioner/tenant-provisioner-config.yaml
@@ -15,7 +15,7 @@ data:
   APIM_PORTAL_SUBDOMAIN: {{ required "Please fill in domain in values.yaml" .Values.portal.domain }}
   BUSINESS_REPORTS_ENABLED: "false"
 {{ if .Values.global.setupDemoDatabase}}
-  DATABASE_HOST: {{ .Release.Name }}-{{ .Values.global.databaseHost }}
+  DATABASE_HOST: {{ .Release.Name }}-headless
 {{ else }}
   DATABASE_HOST: {{ .Values.global.databaseHost | quote }}
 {{ end }}

diff --git a/charts/portal/values-production.yaml b/charts/portal/values-production.yaml
@@ -962,7 +962,7 @@ mysql:
       default-character-set=utf8mb4
       plugin_dir=/opt/bitnami/mysql/plugin
       [mysqld]
-      default_authentication_plugin=mysql_native_password
+      mysql_native_password=ON
       skip-name-resolve
       explicit_defaults_for_timestamp
       basedir=/opt/bitnami/mysql

diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
@@ -816,7 +816,7 @@ mysql:
       default-character-set=utf8mb4
       plugin_dir=/opt/bitnami/mysql/plugin
       [mysqld]
-      default_authentication_plugin=mysql_native_password
+      mysql_native_password=ON
       skip-name-resolve
       explicit_defaults_for_timestamp
       basedir=/opt/bitnami/mysql