chore(builder): canonical charts naming

Author: duanhongyi

.drone/drone.yml

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

charts/builder/templates/builder-clusterrole.yaml

@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

charts/builder/templates/builder-clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

charts/builder/templates/builder-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: 1
   strategy:
@@ -25,55 +25,55 @@ spec:
       initContainers:
       - name: drycc-builder-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-builder
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/builder:{{.Values.image_tag}}
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/builder:{{.Values.imageTag}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         ports:
           - containerPort: 2223
             name: ssh
           - containerPort: 8092
             name: healthsrv
-{{- 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:
           # NOTE(bacongobbler): use drycc/registry_proxy to work around Docker --insecure-registry requirements
           - name: "DRYCC_REGISTRY_PROXY_HOST"
             value: "127.0.0.1"
           - name: "DRYCC_REGISTRY_PROXY_PORT"
-            value: "{{ .Values.global.registry_proxy_port }}"
+            value: "{{ .Values.global.registryProxyPort }}"
           - name: "HEALTH_SERVER_PORT"
             value: "8092"
           - name: "EXTERNAL_PORT"
             value: "2223"
           - name: BUILDER_STORAGE
             value: "{{ .Values.global.storage }}"
           - name: "DRYCC_REGISTRY_LOCATION"
-            value: "{{ .Values.global.registry_location }}"
+            value: "{{ .Values.global.registryLocation }}"
           - name: "TTL_SECONDS_AFTER_FINISHED"
-            value: "{{ .Values.global.ttl_seconds_after_finished }}"
+            value: "{{ .Values.global.ttlSecondsAfterFinished }}"
           # Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
           - name: "GIT_LOCK_TIMEOUT"
             value: "30"
           - name: IMAGEBUILDER_IMAGE_PULL_POLICY
             valueFrom:
               configMapKeyRef:
                 name: imagebuilder-config
-                key: image_pull_policy
+                key: imagePullPolicy
           # This var needs to be passed so that the minio client (https://github.com/minio/mc) will work in Alpine linux
           - name: "DOCKERIMAGE"
             value: "1"

charts/builder/templates/builder-role.yaml

@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

charts/builder/templates/builder-rolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

charts/builder/values.yaml

@@ -1,20 +1,20 @@
-image_org: "drycc"
-image_pull_policy: "Always"
-image_tag: "canary"
-image_registry: "docker.io"
+imageOrg: "drycc"
+imagePullPolicy: "Always"
+imageTag: "canary"
+imageRegistry: "docker.io"
 service:
   # Service type default to LoadBalancer
   type: ClusterIP
   # If service.type is not set to NodePort, the following statement will be ignored.
   nodePort: ""
-# limits_cpu: "100m"
-# limits_memory: "50Mi"
+# limitsCpu: "100m"
+# limitsMemory: "50Mi"
 # builder_pod_node_selector: "disk:ssd"
 
 # When the TTL controller cleans up the Job. default: 6h
 # see: https://kubernetes.io/docs/concepts/workloads/controllers/job/#ttl-mechanism-for-finished-jobs
-ttl_seconds_after_finished: 21600
+ttlSecondsAfterFinished: 21600
 
 global:
   # Role-Based Access Control for Kubernetes >= 1.5
-  use_rbac: false
+  rbac: false