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

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

@@ -8,9 +8,9 @@ metadata:
   annotations:
     "helm.sh/hook": pre-install
 data: 
-  {{ if eq .Values.global.redis_location "on-cluster"}}
+  {{ if eq .Values.global.redisLocation "on-cluster"}}
   password: {{ randAlphaNum 32 | b64enc }}
-  {{ else if eq .Values.global.redis_location "off-cluster"}}
+  {{ else if eq .Values.global.redisLocation "off-cluster"}}
   addrs: {{ .Values.addrs | b64enc }}
   password: {{ .Values.password | b64enc }}
   {{ end }}

charts/redis/templates/redis-statefulset.yaml

@@ -1,12 +1,12 @@
-{{- if eq .Values.global.redis_location "on-cluster" }}
+{{- if eq .Values.global.redisLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: drycc-redis
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
   serviceName: drycc-redis
   replicas: {{ .Values.replicas }}
@@ -20,16 +20,16 @@ spec:
     spec:
       containers:
       - name: drycc-redis
-        image: {{.Values.image_registry}}/{{.Values.image_org}}/redis:{{ .Values.image_tag }}
-        imagePullPolicy: {{ .Values.image_pull_policy }}
-{{- if or (.Values.limits_cpu) (.Values.limits_memory)}}
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/redis:{{ .Values.imageTag }}
+        imagePullPolicy: {{ .Values.imagePullPolicy }}
+{{- 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}}
         command: ["/bin/boot", "--port", "6379"]

charts/redis/templates/redis-svc.yaml

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

charts/redis/values.yaml

@@ -1,17 +1,17 @@
-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"
 
 global:
   # Set the location of Workflow's redis instance
   #
   # Valid values are:
   # - on-cluster: Run Redis within the Kubernetes cluster
   # - off-cluster: Run Redis outside the Kubernetes cluster (configure in redis section)
-  redis_location: "on-cluster"
+  redisLocation: "on-cluster"
 
 # The following parameters are configured only when using an on-cluster Redis instance
 replicas: 1