Skip to content

Commit

Permalink
db and user name
Browse files Browse the repository at this point in the history
  • Loading branch information
RazenaSaleem committed Feb 13, 2024
1 parent 375322a commit c6bcdb4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions charts/quality-trace/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
Create a default fully qualified postgresql name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "tracetest.postgresql.fullname" -}}
{{- define "quality-trace.postgresql.fullname" -}}
{{- include "common.names.dependency.fullname" (dict "chartName" "postgresql" "chartValues" .Values.postgresql "context" $) -}}
{{- end -}}


{{- define "tracetest.database.encryptedPassword" -}}
{{- include "tracetest.database.rawPassword" . | b64enc | quote -}}
{{- define "quality-trace.database.encryptedPassword" -}}
{{- include "quality-trace.database.rawPassword" . | b64enc | quote -}}
{{- end -}}

{{- define "tracetest.database.rawPassword" -}}
{{- define "quality-trace.database.rawPassword" -}}
{{- if .Values.postgresql.enabled }}
{{- if .Values.global.postgresql }}
{{- if .Values.global.postgresql.auth }}
Expand Down
2 changes: 1 addition & 1 deletion charts/quality-trace/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
googleAnalytics:
enabled: {{.Values.analytics.enabled}}
postgres:
host: {{ include "tracetest.postgresql.fullname" . }}
host: {{ include "quality-trace.postgresql.fullname" . }}
user: {{.Values.postgresql.auth.username}}
password: {{.Values.postgresql.auth.password}}
port: 5432
Expand Down
4 changes: 2 additions & 2 deletions charts/quality-trace/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ postgresql:

# credentials for accessing the database
auth:
database: "tracetest"
username: "tracetest"
database: "quality-trace"
username: "quality-trace"
password: not-secure-database-password
existingSecret: ""

Expand Down
2 changes: 1 addition & 1 deletion cli/installer/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func installOtelCollector(conf configuration, ui cliUI.UI) {
}

func fixQualitytraceConfiguration(conf configuration, ui cliUI.UI) {
c := getQualitytraceConfigFileContents("tracetest-postgresql", "tracetest", "not-secure-database-password", ui, conf)
c := getQualitytraceConfigFileContents("quality-trace-postgresql", "quality-trace", "not-secure-database-password", ui, conf)
ttc := createTmpFile("quality-trace-config", string(c), ui)
defer os.Remove(ttc.Name())

Expand Down

0 comments on commit c6bcdb4

Please sign in to comment.