chore(passport): canonical charts naming

Author: duanhongyi

.drone/drone.yml

@@ -117,7 +117,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/passport/values.yaml
+  - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/passport/values.yaml
   - helm package charts/passport --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@passport-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:

charts/passport/templates/passport-certificate.yaml

@@ -1,5 +1,5 @@
-{{- if eq .Values.global.passport_location "on-cluster" }}
-{{- if .Values.global.cert_manager_enabled }}
+{{- if eq .Values.global.passportLocation "on-cluster" }}
+{{- if .Values.global.certManagerEnabled }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -10,7 +10,7 @@ spec:
     name: drycc-cluster-issuer
     kind: ClusterIssuer
   dnsNames:
-  - drycc-passport.{{ .Values.global.platform_domain }}
+  - drycc-passport.{{ .Values.global.platformDomain }}
   privateKey:
     rotationPolicy: Always
 {{- end }}

charts/passport/templates/passport-deployment.yaml

@@ -1,12 +1,12 @@
-{{- if eq .Values.global.passport_location "on-cluster" }}
+{{- if eq .Values.global.passportLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: drycc-passport
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   replicas: {{ .Values.replicas }}
   strategy:
@@ -26,7 +26,7 @@ spec:
       initContainers:
       - name: drycc-passport-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
@@ -35,8 +35,8 @@ spec:
         {{- include "passport.envs" . | indent 8 }}
       containers:
       - name: drycc-passport
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/passport:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/passport:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe:
           httpGet:
             path: /healthz

charts/passport/templates/passport-ingress.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.global.passport_location "on-cluster" }}
+{{- if eq .Values.global.passportLocation "on-cluster" }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -10,16 +10,16 @@ metadata:
     heritage: "{{ .Release.Service }}"
   annotations:
     kubernetes.io/tls-acme: "true"
-    {{- if not (eq .Values.global.ingress_class "") }}
-    kubernetes.io/ingress.class: "{{ .Values.global.ingress_class }}"
+    {{- if not (eq .Values.global.ingressClass "") }}
+    kubernetes.io/ingress.class: "{{ .Values.global.ingressClass }}"
     {{ end }}
 spec:
   rules:
-  - host: drycc-passport.{{ .Values.global.platform_domain }}
+  - host: drycc-passport.{{ .Values.global.platformDomain }}
     http:
       paths:
       - pathType: Prefix
-        {{- if eq .Values.global.ingress_class "gce" "alb" }}
+        {{- if eq .Values.global.ingressClass "gce" "alb" }}
         path: /*
         {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
         path: /
@@ -29,10 +29,10 @@ spec:
             name: drycc-passport
             port:
               number: 80
-  {{ if .Values.global.cert_manager_enabled }}
+  {{ if .Values.global.certManagerEnabled }}
   tls:
     - secretName: drycc-passport-certificate-auto
       hosts:
-        - drycc-passport.{{ .Values.global.platform_domain }}
+        - drycc-passport.{{ .Values.global.platformDomain }}
   {{- end }}
 {{- end }}

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

@@ -1,4 +1,4 @@
-{{- if eq .Values.global.passport_location "on-cluster" }}
+{{- if eq .Values.global.passportLocation "on-cluster" }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -8,13 +8,13 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install
 data:
-  {{- if (.Values.database_url) }}
-  database-url: {{ .Values.database_url | b64enc }}
+  {{- if (.Values.databaseUrl) }}
+  database-url: {{ .Values.databaseUrl | b64enc }}
   {{- end }}
   django-secret-key: {{ randAscii 64 | b64enc }}
   social-auth-drycc-controller-key: {{ randAlphaNum 40 | b64enc }}
   social-auth-drycc-controller-secret: {{ randAlphaNum 64 | b64enc }}
-  {{- if eq .Values.global.grafana_location "on-cluster" }}
+  {{- if eq .Values.global.grafanaLocation "on-cluster" }}
   social-auth-drycc-grafana-key: {{ randAlphaNum 40 | b64enc }}
   social-auth-drycc-grafana-secret: {{ randAlphaNum 64 | b64enc }}
   {{- end }}

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

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

charts/passport/templates/passport-service.yaml

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

charts/passport/values.yaml

@@ -1,13 +1,13 @@
-image_org: "drycc"
-image_pull_policy: "Always"
-image_tag: "canary"
-image_registry: "docker.io"
+imageOrg: "drycc"
+imagePullPolicy: "Always"
+imageTag: "canary"
+imageRegistry: "docker.io"
 # Set passport deployment replicas
 replicas: 1
-# limits_cpu: "100m"
-# limits_memory: "50Mi"
+# limitsCpu: "100m"
+# limitsMemory: "50Mi"
 ## Configuring this will no longer use the built-in database component
-database_url: ""
+databaseUrl: ""
 # Any custom controller environment variables
 # can be specified as key-value pairs under environment
 # this is usually a non required setting.
@@ -42,9 +42,9 @@ environment:
 #  EMAIL_USE_TLS: ""
 #  EMAIL_USE_SSL: ""
 # Used to create Django admin users
-admin_username: "admin"
-admin_password: "admin"
-admin_email: "admin@email.com"
+adminUsername: "admin"
+adminPassword: "admin"
+adminEmail: "admin@email.com"
 
 redis:
   replicas: 1
@@ -55,7 +55,7 @@ global:
   # Valid values are:
   # - on-cluster: Run Grafana within the Kubernetes cluster
   # - off-cluster: Grafana is running outside of the cluster
-  grafana_location: "on-cluster"
+  grafanaLocation: "on-cluster"
 
   # Admin email, used for each component to send email to administrator
   email: "drycc@drycc.cc"
@@ -66,19 +66,19 @@ global:
   #   automatically; backups are sent to object storage
   #   configured above)
   # - off-cluster: Run PostgreSQL outside the Kubernetes cluster (configure in database section)
-  database_location: "on-cluster"
+  databaseLocation: "on-cluster"
 
   # Please check `kubernetes.io/ingress.class`
-  ingress_class: ""
+  ingressClass: ""
   # A domain name consists of one or more parts.
   # Periods (.) are used to separate these parts.
   # Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
   # It must start and end with a lowercase letter or digit.
-  cluster_domain: "cluster.local"
+  clusterDomain: "cluster.local"
   # The public resolvable hostname to build your cluster with.
   #
   # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
-  platform_domain: ""
+  platformDomain: ""
   # Whether cert_passport is enabled to automatically generate passport certificates
-  cert_manager_enabled: true
-  passport_location: "on-cluster"
+  certManagerEnabled: true
+  passportLocation: "on-cluster"