Skip to content

Commit 81d5e9d

Browse files
committed
fix(monitor): charts naming
1 parent 8cc65ad commit 81d5e9d

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

charts/monitor/templates/_helpers.tmpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{/* Generate monitor grafana envs */}}
22
{{- define "grafana.envs" }}
33
env:
4-
{{- if eq .Values.global.influxdb_location "off-cluster" }}
4+
{{- if eq .Values.global.influxdbLocation "off-cluster" }}
55
- name: "INFLUXDB_URL"
66
valueFrom:
77
secretKeyRef:
@@ -33,22 +33,22 @@ env:
3333
- name: "DEFAULT_USER_PASSWORD"
3434
value: {{.Values.grafana.password}}
3535
- name: "KUBERNETES_CLUSTER_DOMAIN"
36-
value: {{.Values.global.cluster_domain}}
36+
value: {{.Values.global.clusterDomain}}
3737
{{- range $key, $value := .Values.grafana.environment }}
3838
- name: {{ $key }}
3939
value: {{ $value | quote }}
4040
{{- end }}
4141
- name: "DRYCC_GRAFANA_DOMAIN"
42-
{{- if .Values.global.cert_manager_enabled }}
43-
value: https://drycc-monitor-grafana.{{ .Values.global.platform_domain }}
42+
{{- if .Values.global.certManagerEnabled }}
43+
value: https://drycc-monitor-grafana.{{ .Values.global.platformDomain }}
4444
{{- else }}
45-
value: http://drycc-monitor-grafana.{{ .Values.global.platform_domain }}
45+
value: http://drycc-monitor-grafana.{{ .Values.global.platformDomain }}
4646
{{- end }}
4747
- name: "DRYCC_PASSPORT_DOMAIN"
48-
{{- if .Values.global.cert_manager_enabled }}
49-
value: https://drycc-passport.{{ .Values.global.platform_domain }}
48+
{{- if .Values.global.certManagerEnabled }}
49+
value: https://drycc-passport.{{ .Values.global.platformDomain }}
5050
{{- else }}
51-
value: http://drycc-passport.{{ .Values.global.platform_domain }}
51+
value: http://drycc-passport.{{ .Values.global.platformDomain }}
5252
{{- end }}
5353
- name: "SOCIAL_AUTH_DRYCC_AUTHORIZATION_URL"
5454
value: "$(DRYCC_PASSPORT_DOMAIN)/oauth/authorize/"

charts/monitor/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ grafana:
1313
# can be specified as key-value pairs under environment
1414
# this is usually a non required setting.
1515
environment:
16+
BASIC_AUTH: false
1617
ALLOW_SIGN_UP: false
1718
telegraf:
1819
imageOrg: "drycc"

0 commit comments

Comments
 (0)