fix(controller): wrong name

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -3,40 +3,40 @@
 {{ $redisNodeCount := .Values.redis.replicas | int }}
 env:
 - name: REGISTRATION_MODE
-  value: {{ .Values.registration_mode }}
+  value: {{ .Values.registrationMode }}
 # NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
 - name: "DRYCC_REGISTRY_PROXY_HOST"
   value: "127.0.0.1"
 # Environmental variable value for $INGRESS_CLASS
 - name: "DRYCC_INGRESS_CLASS"
-  value: "{{ .Values.global.ingress_class }}"
+  value: "{{ .Values.global.ingressClass }}"
 - name: "DRYCC_PLATFORM_DOMAIN"
-  value: "{{ .Values.global.platform_domain }}"
+  value: "{{ .Values.global.platformDomain }}"
 - name: "K8S_API_VERIFY_TLS"
-  value: "{{ .Values.k8s_api_verify_tls }}"
+  value: "{{ .Values.k8sApiVerifyTls }}"
 - name: "DRYCC_REGISTRY_PROXY_PORT"
-  value: "{{ .Values.global.registry_proxy_port }}"
+  value: "{{ .Values.global.registryProxyPort }}"
 - name: "APP_STORAGE"
   value: "{{ .Values.global.storage}}"
 - name: "DRYCC_REGISTRY_LOCATION"
-  value: "{{ .Values.global.registry_location }}"
+  value: "{{ .Values.global.registryLocation }}"
 - name: "DRYCC_REGISTRY_SECRET_PREFIX"
-  value: "{{ .Values.global.registry_secret_prefix }}"
+  value: "{{ .Values.global.registrySecretPrefix }}"
 - name: "IMAGE_PULL_POLICY"
-  value: "{{ .Values.app_image_pull_policy }}"
+  value: "{{ .Values.appImagePullPolicy }}"
 - name: "KUBERNETES_CLUSTER_DOMAIN"
-  value: "{{ .Values.global.cluster_domain }}"
-{{- if (.Values.app_storage_class) }}
+  value: "{{ .Values.global.clusterDomain }}"
+{{- if (.Values.appStorageClass) }}
 - name: "DRYCC_APP_STORAGE_CLASS"
-  value: "{{ .Values.app_storage_class }}"
+  value: "{{ .Values.appStorageClass }}"
 {{- end }}
 - name: "TZ"
   value: {{ .Values.time_zone | default "UTC" | quote }}
 - name: "DJANGO_SETTINGS_MODULE"
   value: "api.settings.production"
-{{- if (.Values.deploy_hook_urls) }}
+{{- if (.Values.deployHookUrls) }}
 - name: DRYCC_DEPLOY_HOOK_URLS
-  value: "{{ .Values.deploy_hook_urls }}"
+  value: "{{ .Values.deployHookUrls }}"
 - name: DRYCC_DEPLOY_HOOK_SECRET_KEY
   valueFrom:
     secretKeyRef:
@@ -53,13 +53,13 @@ env:
     secretKeyRef:
       name: builder-key-auth
       key: builder-key
-{{- if (.Values.database_url) }}
+{{- if (.Values.databaseUrl) }}
 - name: DRYCC_DATABASE_URL
   valueFrom:
     secretKeyRef:
       name: controller-creds
-      key: database_url
-{{- else if eq .Values.global.database_location "on-cluster"  }}
+      key: databaseUrl
+{{- else if eq .Values.global.databaseLocation "on-cluster"  }}
 - name: DRYCC_DATABASE_USER
   valueFrom:
     secretKeyRef:
@@ -82,10 +82,10 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
-{{- if eq .Values.global.redis_location "on-cluster"}}
+{{- if eq .Values.global.redisLocation "on-cluster"}}
 - name: DRYCC_REDIS_ADDRS
-  value: "{{range $i := until $redisNodeCount}}drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:6379{{if lt (add 1 $i) $redisNodeCount}},{{end}}{{end}}"
-{{- else if eq .Values.global.redis_location "off-cluster" }}
+  value: "{{range $i := until $redisNodeCount}}drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:6379{{if lt (add 1 $i) $redisNodeCount}},{{end}}{{end}}"
+{{- else if eq .Values.global.redisLocation "off-cluster" }}
 - name: DRYCC_REDIS_ADDRS
   valueFrom:
     secretKeyRef:
@@ -97,7 +97,7 @@ env:
     secretKeyRef:
       name: redis-creds
       key: password
-{{- if eq .Values.global.influxdb_location "off-cluster" }}
+{{- if eq .Values.global.influxdbLocation "off-cluster" }}
 - name: "DRYCC_INFLUXDB_URL"
   valueFrom:
     secretKeyRef:
@@ -122,13 +122,13 @@ env:
     secretKeyRef:
       name: influxdb-creds
       key: token
-{{- if eq .Values.global.rabbitmq_location "off-cluster"}}
+{{- if eq .Values.global.rabbitmqLocation "off-cluster"}}
 - name: "DRYCC_RABBITMQ_URL"
   valueFrom:
     secretKeyRef:
       name: rabbitmq-creds
       key: url
-{{- else if eq .Values.global.rabbitmq_location "on-cluster" }}
+{{- else if eq .Values.global.rabbitmqLocation "on-cluster" }}
 - name: "DRYCC_RABBITMQ_USERNAME"
   valueFrom:
     secretKeyRef:
@@ -140,14 +140,14 @@ env:
       name: rabbitmq-creds
       key: password
 - name: "DRYCC_RABBITMQ_URL"
-  value: "amqp://$(DRYCC_RABBITMQ_USERNAME):$(DRYCC_RABBITMQ_PASSWORD)@drycc-rabbitmq.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:5672/drycc"
+  value: "amqp://$(DRYCC_RABBITMQ_USERNAME):$(DRYCC_RABBITMQ_PASSWORD)@drycc-rabbitmq.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:5672/drycc"
 {{- end }}
-{{- if eq .Values.global.passport_location "on-cluster"}}
+{{- if eq .Values.global.passportLocation "on-cluster"}}
 - name: "DRYCC_PASSPORT_DOMAIN"
-{{- if .Values.global.cert_manager_enabled }}
-  value: https://drycc-passport.{{ .Values.global.platform_domain }}
+{{- if .Values.global.certManagerEnabled }}
+  value: https://drycc-passport.{{ .Values.global.platformDomain }}
 {{- else }}
-  value: http://drycc-passport.{{ .Values.global.platform_domain }}
+  value: http://drycc-passport.{{ .Values.global.platformDomain }}
 {{- end }}
 - name: "SOCIAL_AUTH_DRYCC_AUTHORIZATION_URL"
   value: "$(DRYCC_PASSPORT_DOMAIN)/oauth/authorize/"
@@ -183,14 +183,14 @@ env:
 
 {{/* Generate controller deployment limits */}}
 {{- define "controller.limits" -}}
-{{- if or (.Values.limits_cpu) (.Values.limits_memory) }}
+{{- if or (.Values.limitsCpu) (.Values.limitsMemory) }}
 resources:
   limits:
-{{- if (.Values.limits_cpu) }}
-    cpu: {{.Values.limits_cpu}}
+{{- if (.Values.limitsCpu) }}
+    cpu: {{.Values.limitsCpu}}
 {{- end }}
-{{- if (.Values.limits_memory) }}
-    memory: {{.Values.limits_memory}}
+{{- if (.Values.limitsMemory) }}
+    memory: {{.Values.limitsMemory}}
 {{- end }}
 {{- end }}
 {{- end }}