chore(database): canonical charts naming

Author: duanhongyi

.drone/drone.yml

@@ -115,7 +115,7 @@ steps:
 - name: generate chart
   commands:
   - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
-  - sed -i "s/image_tag:\ \"canary\"/image_tag:\ $IMAGE_TAG/g" charts/database/values.yaml
+  - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/database/values.yaml
   - helm package charts/database --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@database-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:

charts/database/templates/database-deployment.yaml

@@ -1,12 +1,12 @@
-{{- if eq .Values.global.database_location "on-cluster" }}
+{{- if eq .Values.global.databaseLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: drycc-database
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   replicas: 1
   strategy:
@@ -23,26 +23,26 @@ spec:
       initContainers:
       - name: drycc-database-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
           - -a
           - $(DRYCC_MINIO_SERVICE_HOST):$(DRYCC_MINIO_SERVICE_PORT)
       containers:
         - name: drycc-database
-          image: {{.Values.image_registry}}/{{.Values.image_org}}/postgres:{{.Values.image_tag}}
-          imagePullPolicy: {{.Values.image_pull_policy}}
+          image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/postgres:{{.Values.imageTag}}
+          imagePullPolicy: {{.Values.imagePullPolicy}}
           ports:
             - containerPort: 5432
-{{- 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}}
           env:

charts/database/templates/database-secret-creds.yaml

@@ -1,4 +1,4 @@
-{{ if eq .Values.global.database_location "on-cluster"}}
+{{ if eq .Values.global.databaseLocation "on-cluster"}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -11,6 +11,6 @@ metadata:
 data:
   user: {{ if .Values.username | default "" | ne "" }}{{ .Values.username | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
   password: {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  controller-database-name: {{ if .Values.controller_database_name | default "" | ne "" }}{{ .Values.controller_database_name | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  passport-database-name: {{ if .Values.passport_database_name | default "" | ne "" }}{{ .Values.passport_database_name | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+  controller-database-name: {{ if .Values.controllerDatabaseName | default "" | ne "" }}{{ .Values.controllerDatabaseName | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+  passport-database-name: {{ if .Values.passportDatabaseName | default "" | ne "" }}{{ .Values.passportDatabaseName | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
 {{- end }}

charts/database/templates/database-service-account.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.global.database_location "on-cluster" }}
+{{- if eq .Values.global.databaseLocation "on-cluster" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/database/templates/database-service.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.global.database_location "on-cluster" }}
+{{- if eq .Values.global.databaseLocation "on-cluster" }}
 apiVersion: v1
 kind: Service
 metadata:

charts/database/values.yaml

@@ -1,13 +1,13 @@
-image_org: "drycc"
-image_pull_policy: "Always"
-image_tag: "canary"
-image_registry: "docker.io"
-# limits_cpu: "100m"
-# limits_memory: "50Mi"
+imageOrg: "drycc"
+imagePullPolicy: "Always"
+imageTag: "canary"
+imageRegistry: "docker.io"
+# limitsCpu: "100m"
+# limitsMemory: "50Mi"
 timeout: "1200"
 # The username and password to be used by the on-cluster database.
 # If left empty they will be generated using randAlphaNum
 username: ""
 password: ""
-controller_database_name: "drycc_controller"
-passport_database_name: "drycc_passport"
+controllerDatabaseName: "drycc_controller"
+passportDatabaseName: "drycc_passport"