chore(controller): canonical charts naming

duanhongyi · duanhongyi · commit 7af93bcb2b89 · 2022-01-14T10:43:55.000+08:00
diff --git a/.drone/drone.yml b/.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/controller/values.yaml
+  - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/controller/values.yaml
   - helm package charts/controller --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@controller-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:
diff --git a/charts/controller/templates/controller-celery.yaml b/charts/controller/templates/controller-celery.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
-  replicas: {{ .Values.celery_replicas }}
+  replicas: {{ .Values.celeryReplicas }}
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -25,7 +25,7 @@ spec:
       initContainers:
       - name: drycc-controller-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
@@ -36,8 +36,8 @@ spec:
         {{- include "controller.envs" . | indent 8 }}
       containers:
       - name: drycc-controller-celery-high
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - /bin/bash
           - -c
@@ -46,8 +46,8 @@ spec:
         {{- include "controller.limits" . | indent 8 }}
         {{- include "controller.envs" . | indent 8 }}
       - name: drycc-controller-celery-middle
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - /bin/bash
           - -c
@@ -56,8 +56,8 @@ spec:
         {{- include "controller.limits" . | indent 8 }}
         {{- include "controller.envs" . | indent 8 }}
       - name: drycc-controller-celery-low
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - /bin/bash
           - -c
diff --git a/charts/controller/templates/controller-certificate.yaml b/charts/controller/templates/controller-certificate.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cert_manager_enabled }}
+{{- if .Values.global.certManagerEnabled }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -9,7 +9,7 @@ spec:
     name: drycc-cluster-issuer
     kind: ClusterIssuer
   dnsNames:
-  - drycc.{{ .Values.global.platform_domain }}
+  - drycc.{{ .Values.global.platformDomain }}
   privateKey:
     rotationPolicy: Always
 {{- end }}
diff --git a/charts/controller/templates/controller-clusterrole.yaml b/charts/controller/templates/controller-clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/charts/controller/templates/controller-clusterrolebinding.yaml b/charts/controller/templates/controller-clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/charts/controller/templates/controller-cronjob-daily.yaml b/charts/controller/templates/controller-cronjob-daily.yaml
@@ -5,10 +5,10 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   schedule: "0 0 * * *"
-  concurrencyPolicy: {{ .Values.concurrency_policy }}
+  concurrencyPolicy: {{ .Values.concurrencyPolicy }}
   successfulJobsHistoryLimit: 1
   failedJobsHistoryLimit: 1
   jobTemplate:
@@ -20,7 +20,7 @@ spec:
           initContainers:
           - name: drycc-controller-cronjob-daily-init
             image: docker.io/drycc/python-dev:latest
-            imagePullPolicy: {{.Values.image_pull_policy}}
+            imagePullPolicy: {{.Values.imagePullPolicy}}
             command:
               - netcat
               - -v
@@ -30,16 +30,16 @@ spec:
               - $(DRYCC_REDIS_ADDRS)
             {{- include "controller.envs" . | indent 12 }}
           containers:
-          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
-            imagePullPolicy: {{.Values.image_pull_policy}}
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
+            imagePullPolicy: {{.Values.imagePullPolicy}}
             name: drycc-controller-load-db-state-to-k8s
             command:
               - /bin/bash
               - -c
             args:
               - python /app/manage.py load_db_state_to_k8s
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-apps
             command:
@@ -48,7 +48,7 @@ spec:
             args:
               - python -u /app/manage.py measure_apps
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-resources
             command:
@@ -57,7 +57,7 @@ spec:
             args:
               - python -u /app/manage.py measure_resources
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-volumes
             command:
diff --git a/charts/controller/templates/controller-cronjob-hourly.yaml b/charts/controller/templates/controller-cronjob-hourly.yaml
@@ -5,10 +5,10 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   schedule: "0 */1 * * *"
-  concurrencyPolicy: {{ .Values.concurrency_policy }}
+  concurrencyPolicy: {{ .Values.concurrencyPolicy }}
   successfulJobsHistoryLimit: 1
   failedJobsHistoryLimit: 1
   jobTemplate:
@@ -20,7 +20,7 @@ spec:
           initContainers:
           - name: drycc-controller-init
             image: docker.io/drycc/python-dev:latest
-            imagePullPolicy: {{.Values.image_pull_policy}}
+            imagePullPolicy: {{.Values.imagePullPolicy}}
             command:
               - netcat
               - -v
@@ -30,7 +30,7 @@ spec:
               - $(DRYCC_REDIS_ADDRS)
             {{- include "controller.envs" . | indent 12 }}
           containers:
-          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-networks
             command:
diff --git a/charts/controller/templates/controller-deployment.yaml b/charts/controller/templates/controller-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   replicas: {{ .Values.replicas }}
   strategy:
@@ -25,7 +25,7 @@ spec:
       initContainers:
       - name: drycc-controller-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
@@ -36,8 +36,8 @@ spec:
         {{- include "controller.envs" . | indent 8 }}
       containers:
       - name: drycc-controller
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/charts/controller/templates/controller-ingress.yaml b/charts/controller/templates/controller-ingress.yaml
@@ -9,16 +9,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.{{ .Values.global.platform_domain }}
+  - host: drycc.{{ .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: /
@@ -28,9 +28,9 @@ spec:
             name: drycc-controller
             port:
               number: 80
-  {{- if .Values.global.cert_manager_enabled }}
+  {{- if .Values.global.certManagerEnabled }}
   tls:
     - secretName: drycc-controller-certificate-auto
       hosts:
-        - drycc.{{ .Values.global.platform_domain }}
+        - drycc.{{ .Values.global.platformDomain }}
   {{- end }}
diff --git a/charts/controller/templates/controller-secret-creds.yaml b/charts/controller/templates/controller-secret-creds.yaml
@@ -7,8 +7,8 @@ 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 }}
   deploy-hook-secret-key: {{ randAscii 64 | b64enc }}
diff --git a/charts/controller/templates/controller-webhook-deloyment.yaml b/charts/controller/templates/controller-webhook-deloyment.yaml
@@ -15,7 +15,7 @@ spec:
       initContainers:
       - name: drycc-controller-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
@@ -26,8 +26,8 @@ spec:
         {{- include "controller.envs" . | indent 8 }}
       containers:
       - name: drycc-controller
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/charts/controller/values.yaml b/charts/controller/values.yaml
@@ -1,41 +1,41 @@
-image_org: "drycc"
-image_pull_policy: "Always"
-image_tag: "canary"
-image_registry: "docker.io"
-app_image_pull_policy: "Always"
+imageOrg: "drycc"
+imagePullPolicy: "Always"
+imageTag: "canary"
+imageRegistry: "docker.io"
+appImagePullPolicy: "Always"
 # A comma-separated list of URLs to send app release information to
 # See https://www.drycc.cc/managing-workflow/deploy-hooks/
-deploy_hook_urls: ""
-# limits_cpu: "100m"
-# limits_memory: "50Mi"
+deployHookUrls: ""
+# limitsCpu: "100m"
+# limitsMemory: "50Mi"
 # Possible values are:
 # enabled - allows for open registration
 # disabled - turns off open registration
 # admin_only - allows for registration by an admin only.
-registration_mode: "admin_only"
+registrationMode: "admin_only"
 # Option to disable ssl verification to connect to k8s api server
-k8s_api_verify_tls: "true"
+k8sApiVerifyTls: "true"
 
 # Set storageClassName, It is used for application mount.
-app_storage_class: ""
+appStorageClass: ""
 # Set controller deployment  replicas
 replicas: 1
 # Set celery replicas
-celery_replicas: 1
+celeryReplicas: 1
 # Set cronjob concurrencyPolicy
 # Allow (default): The cron job allows concurrently running jobs
 # Forbid: The cron job does not allow concurrent runs; if it is time for a new job run and the previous job run hasn't finished yet, the cron job skips the new job run
 # Replace: If it is time for a new job run and the previous job run hasn't finished yet, the cron job replaces the currently running job run with a new job run
-concurrency_policy: "Replace"
+concurrencyPolicy: "Replace"
 # 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.
 environment:
   RESERVED_NAMES: "drycc, drycc-builder, drycc-monitor-grafana"
-##　Oauth settings. If passport_location is off-cluster, set the following environment variables
+##　Oauth settings. If passportLocation is off-cluster, set the following environment variables
 #  LOGIN_REDIRECT_URL: ""
 #  SOCIAL_AUTH_DRYCC_AUTHORIZATION_URL: ""
 #  SOCIAL_AUTH_DRYCC_ACCESS_TOKEN_URL: ""
@@ -67,31 +67,31 @@ 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"
 
   # Set the location of Workflow's Registry
   #
   # Valid values are:
   # - on-cluster: Run registry within the Kubernetes cluster
   # - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,self-hosted)
-  registry_location: "on-cluster"
+  registryLocation: "on-cluster"
   # The host port to which registry proxy binds to
-  registry_proxy_port: 5555
+  registryProxyPort: 5555
   # Prefix for the imagepull secret created when using private registry
-  registry_secret_prefix: "private-registry"
+  registrySecretPrefix: "private-registry"
   # Role-Based Access Control for Kubernetes >= 1.5
-  use_rbac: false
+  rbac: false
   # 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_manager is enabled to automatically generate controller certificates
-  cert_manager_enabled: true
-  passport_location: "on-cluster"
+  certManagerEnabled: true
+  passportLocation: "on-cluster"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if (.Values.global.use_rbac) -}}`
	`1`	`+{{- if (.Values.global.rbac) -}}`
`2`	`2`	`kind: ClusterRole`
`3`	`3`	`apiVersion: rbac.authorization.k8s.io/v1`
`4`	`4`	`metadata:`