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

charts/helmbroker/templates/helmbroker-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
@@ -24,8 +24,8 @@ spec:
       serviceAccount: drycc-helmbroker
       containers:
         - name: drycc-helmbroker-celery
-          image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
-          imagePullPolicy: {{.Values.image_pull_policy}}
+          image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/helmbroker:{{.Values.imageTag}}
+          imagePullPolicy: {{.Values.imagePullPolicy}}
           command:
             - /bin/bash
             - -c

charts/helmbroker/templates/helmbroker-certificate.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.cert_manager_enabled }}
+{{- if .Values.certManagerEnabled }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -9,7 +9,7 @@ spec:
     name: drycc-cluster-issuer
     kind: ClusterIssuer
   dnsNames:
-  - drycc-helmbroker.{{ .Values.platform_domain }}
+  - drycc-helmbroker.{{ .Values.platformDomain }}
   privateKey:
     rotationPolicy: Always
 {{- end }}

charts/helmbroker/templates/helmbroker-cm.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.image_tag }}
+    component.drycc.cc/version: {{ .Values.imageTag }}
 data:
   repositories: |
     {{- range .Values.repositories }}

charts/helmbroker/templates/helmbroker-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:
@@ -18,8 +18,8 @@ spec:
           restartPolicy: OnFailure
           serviceAccount: drycc-helmbroker
           containers:
-          - image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
-            imagePullPolicy: {{.Values.image_pull_policy}}
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/helmbroker:{{.Values.imageTag}}
+            imagePullPolicy: {{.Values.imagePullPolicy}}
             name: drycc-helmbroker-cleaner
             command:
               - /bin/bash

charts/helmbroker/templates/helmbroker-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:
@@ -24,8 +24,8 @@ spec:
       serviceAccount: drycc-helmbroker
       initContainers:
         - name: loader
-          image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
-          imagePullPolicy: {{.Values.image_pull_policy}}
+          image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/helmbroker:{{.Values.imageTag}}
+          imagePullPolicy: {{.Values.imagePullPolicy}}
           command:
             - /bin/bash
             - -c
@@ -35,8 +35,8 @@ spec:
           {{- include "helmbroker.volumeMounts" . | indent 10 }}
       containers:
         - name: drycc-helmbroker
-          image: {{.Values.image_registry}}/{{.Values.image_org}}/helmbroker:{{.Values.image_tag}}
-          imagePullPolicy: {{.Values.image_pull_policy}}
+          image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/helmbroker:{{.Values.imageTag}}
+          imagePullPolicy: {{.Values.imagePullPolicy}}
           livenessProbe:
             httpGet:
               path: /healthz

charts/helmbroker/templates/helmbroker-ingress.yaml

@@ -9,16 +9,16 @@ metadata:
     heritage: "{{ .Release.Service }}"
   annotations:
     kubernetes.io/tls-acme: "true"
-    {{- if not (eq .Values.ingress_class "") }}
-    kubernetes.io/ingress.class: "{{ .Values.ingress_class }}"
+    {{- if not (eq .Values.ingressClass "") }}
+    kubernetes.io/ingress.class: "{{ .Values.ingressClass }}"
     {{- end }}
 spec:
   rules:
-  - host: drycc-helmbroker.{{ .Values.platform_domain }}
+  - host: drycc-helmbroker.{{ .Values.platformDomain }}
     http:
       paths:
       - pathType: Prefix
-        {{- if eq .Values.ingress_class "gce" "alb" }}
+        {{- if eq .Values.ingressClass "gce" "alb" }}
         path: /*
         {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
         path: /
@@ -28,9 +28,9 @@ spec:
             name: drycc-helmbroker
             port:
               number: 80
-  {{- if .Values.cert_manager_enabled }}
+  {{- if .Values.certManagerEnabled }}
   tls:
     - secretName: drycc-helmbroker-certificate-auto
       hosts:
-        - drycc-helmbroker.{{ .Values.platform_domain }}
+        - drycc-helmbroker.{{ .Values.platformDomain }}
   {{- end }}

charts/helmbroker/values.yaml

@@ -1,17 +1,17 @@
-image_org: "drycc"
-image_tag: "canary"
-image_registry: "docker.io"
-image_pull_policy: "Always"
+imageOrg: "drycc"
+imageTag: "canary"
+imageRegistry: "docker.io"
+imagePullPolicy: "Always"
 replicas: 1
-# limits_cpu: "100m"
-# limits_memory: "50Mi"
+# limitsCpu: "100m"
+# limitsMemory: "50Mi"
 
 ## config the helm-broker repositories
 repositories:
 - name: drycc-helm-broker
   url: https://github.com/drycc/addons/releases/download/latest/index.yaml
 
-celery_replicas: 1
+celeryReplicas: 1
 
 # broker_credentials:
 # Optional Usernames and passwords that will be required to communicate with service broker
@@ -30,15 +30,15 @@ persistence:
   storageClass: ""
   volumeName: ""
 
-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-helmbroker.$HOSTNAME"
-platform_domain: ""
+platformDomain: ""
 # Whether cert_manager is enabled to automatically generate helmbroker certificates
-cert_manager_enabled: true
+certManagerEnabled: true