chore(monitor): canonical charts naming

duanhongyi · duanhongyi · commit b2a80dc1c24e · 2022-01-14T10:44:58.000+08:00
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -141,7 +141,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/monitor/values.yaml
+  - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/monitor/values.yaml
   - helm package charts/monitor --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@monitor-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:
diff --git a/charts/monitor/templates/monitor-clusterrole.yaml b/charts/monitor/templates/monitor-clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if (.Values.global.use_rbac) -}}
+{{- if (.Values.global.rbac) -}}
 # Define global role with the default system:aggregate-to-view cluster role and the two rules we just created
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/charts/monitor/templates/monitor-grafana-certificate.yaml b/charts/monitor/templates/monitor-grafana-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-monitor-grafana.{{ .Values.global.platform_domain }}
+  - drycc-monitor-grafana.{{ .Values.global.platformDomain }}
   privateKey:
     rotationPolicy: Always
 {{- end }}
diff --git a/charts/monitor/templates/monitor-grafana-deployment.yaml b/charts/monitor/templates/monitor-grafana-deployment.yaml
@@ -1,12 +1,12 @@
-{{- if eq .Values.global.grafana_location "on-cluster" }}
+{{- if eq .Values.global.grafanaLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: drycc-monitor-grafana
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.grafana.image_tag }}
+    component.drycc.cc/version: {{ .Values.grafana.imageTag }}
 spec:
   replicas: 1
   strategy:
@@ -24,16 +24,16 @@ spec:
     spec:
       containers:
       - name: drycc-monitor-grafana
-        image: {{.Values.grafana.image_registry}}/{{.Values.grafana.image_org}}/grafana:{{.Values.grafana.image_tag}}
-        imagePullPolicy: {{.Values.grafana.image_pull_policy}}
-{{- if or (.Values.grafana.limits_cpu) (.Values.grafana.limits_memory)}}
+        image: {{.Values.grafana.imageRegistry}}/{{.Values.grafana.imageOrg}}/grafana:{{.Values.grafana.imageTag}}
+        imagePullPolicy: {{.Values.grafana.imagePullPolicy}}
+{{- if or (.Values.grafana.limitsCpu) (.Values.grafana.limitsMemory)}}
         resources:
           limits:
-{{- if (.Values.grafana.limits_cpu) }}
-            cpu: {{.Values.grafana.limits_cpu}}
+{{- if (.Values.grafana.limitsCpu) }}
+            cpu: {{.Values.grafana.limitsCpu}}
 {{- end}}
-{{- if (.Values.grafana.limits_memory) }}
-            memory: {{.Values.grafana.limits_memory}}
+{{- if (.Values.grafana.limitsMemory) }}
+            memory: {{.Values.grafana.limitsMemory}}
 {{- end}}
 {{- end}}
         ports:
diff --git a/charts/monitor/templates/monitor-grafana-ingress.yaml b/charts/monitor/templates/monitor-grafana-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-monitor-grafana.{{ .Values.global.platform_domain }}
+  - host: drycc-monitor-grafana.{{ .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-monitor-grafana
             port: 
               number: 80
-  {{ if .Values.global.cert_manager_enabled }}
+  {{ if .Values.global.certManagerEnabled }}
   tls:
     - secretName: drycc-monitor-grafana-auto-tls
       hosts:
-        - drycc-monitor-grafana.{{ .Values.global.platform_domain }}
+        - drycc-monitor-grafana.{{ .Values.global.platformDomain }}
   {{- end }}
diff --git a/charts/monitor/templates/monitor-grafana-svc.yaml b/charts/monitor/templates/monitor-grafana-svc.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.global.grafana_location "on-cluster" }}
+{{- if eq .Values.global.grafanaLocation "on-cluster" }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/monitor/templates/monitor-telegraf-clusterrole.yaml b/charts/monitor/templates/monitor-telegraf-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/monitor/templates/monitor-telegraf-clusterrolebinding.yaml b/charts/monitor/templates/monitor-telegraf-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/monitor/templates/monitor-telegraf-daemon.yaml b/charts/monitor/templates/monitor-telegraf-daemon.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.telegraf.image_tag }}
+    component.drycc.cc/version: {{ .Values.telegraf.imageTag }}
 spec:
   selector:
     matchLabels:
@@ -23,14 +23,14 @@ spec:
       initContainers:
       - name: drycc-monitor-telegraf-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
           - -u
           - $(INFLUXDB_URLS_V2)
         env:
-{{- if eq .Values.global.influxdb_location "off-cluster" }}
+{{- if eq .Values.global.influxdbLocation "off-cluster" }}
         - name: "INFLUXDB_URLS_V2"
           valueFrom:
             secretKeyRef:
@@ -46,24 +46,24 @@ spec:
 {{- end }}
       containers:
       - name: drycc-monitor-telegraf
-        image: {{.Values.telegraf.image_registry}}/{{.Values.telegraf.image_org}}/telegraf:{{.Values.telegraf.image_tag}}
-        imagePullPolicy: {{.Values.telegraf.image_pull_policy}}
-{{- if or (.Values.telegraf.limits_cpu) (.Values.telegraf.limits_memory)}}
+        image: {{.Values.telegraf.imageRegistry}}/{{.Values.telegraf.imageOrg}}/telegraf:{{.Values.telegraf.imageTag}}
+        imagePullPolicy: {{.Values.telegraf.imagePullPolicy}}
+{{- if or (.Values.telegraf.limitsCpu) (.Values.telegraf.limitsMemory)}}
         resources:
           limits:
-{{- if (.Values.telegraf.limits_cpu) }}
-            cpu: {{.Values.telegraf.limits_cpu}}
+{{- if (.Values.telegraf.limitsCpu) }}
+            cpu: {{.Values.telegraf.limitsCpu}}
 {{- end}}
-{{- if (.Values.telegraf.limits_memory) }}
-            memory: {{.Values.telegraf.limits_memory}}
+{{- if (.Values.telegraf.limitsMemory) }}
+            memory: {{.Values.telegraf.limitsMemory}}
 {{- end}}
 {{- end}}
         env:
         - name: POD_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-{{- if eq .Values.global.influxdb_location "off-cluster" }}
+{{- if eq .Values.global.influxdbLocation "off-cluster" }}
         - name: "INFLUXDB_URLS_V2"
           valueFrom:
             secretKeyRef:
diff --git a/charts/monitor/templates/monitor-telegraf-deployment.yaml b/charts/monitor/templates/monitor-telegraf-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.telegraf.image_tag }}
+    component.drycc.cc/version: {{ .Values.telegraf.imageTag }}
 spec:
   replicas: 1
   selector:
@@ -26,14 +26,14 @@ spec:
       initContainers:
       - name: drycc-monitor-telegraf-init
         image: docker.io/drycc/python-dev:latest
-        imagePullPolicy: {{.Values.image_pull_policy}}
+        imagePullPolicy: {{.Values.imagePullPolicy}}
         command:
           - netcat
           - -v
           - -u
           - $(INFLUXDB_URLS_V2)
         env:
-{{- if eq .Values.global.influxdb_location "off-cluster" }}
+{{- if eq .Values.global.influxdbLocation "off-cluster" }}
         - name: "INFLUXDB_URLS_V2"
           valueFrom:
             secretKeyRef:
@@ -49,24 +49,24 @@ spec:
 {{- end }}
       containers:
       - name: drycc-monitor-telegraf
-        image: {{.Values.telegraf.image_registry}}/{{.Values.telegraf.image_org}}/telegraf:{{.Values.telegraf.image_tag}}
-        imagePullPolicy: {{.Values.telegraf.image_pull_policy}}
-{{- if or (.Values.telegraf.limits_cpu) (.Values.telegraf.limits_memory)}}
+        image: {{.Values.telegraf.imageRegistry}}/{{.Values.telegraf.imageOrg}}/telegraf:{{.Values.telegraf.imageTag}}
+        imagePullPolicy: {{.Values.telegraf.imagePullPolicy}}
+{{- if or (.Values.telegraf.limitsCpu) (.Values.telegraf.limitsMemory)}}
         resources:
           limits:
-{{- if (.Values.telegraf.limits_cpu) }}
-            cpu: {{.Values.telegraf.limits_cpu}}
+{{- if (.Values.telegraf.limitsCpu) }}
+            cpu: {{.Values.telegraf.limitsCpu}}
 {{- end}}
-{{- if (.Values.telegraf.limits_memory) }}
-            memory: {{.Values.telegraf.limits_memory}}
+{{- if (.Values.telegraf.limitsMemory) }}
+            memory: {{.Values.telegraf.limitsMemory}}
 {{- end}}
 {{- end}}
         env:
         - name: POD_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        {{- if eq .Values.global.influxdb_location "off-cluster" }}
+        {{- if eq .Values.global.influxdbLocation "off-cluster" }}
         - name: "INFLUXDB_URLS_V2"
           valueFrom:
             secretKeyRef:
@@ -100,19 +100,19 @@ spec:
         - name: "AGENT_BUFFER_LIMIT"
           value: "100000"
         - name: "NSQ_CONSUMER_SERVERS"
-          value: "[{{range $i := until $nsqdNodeCount}}\"drycc-nsqd-{{$i}}.drycc-nsqd.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.nsqd.tcp_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
+          value: "[{{range $i := until $nsqdNodeCount}}\"drycc-nsqd-{{$i}}.drycc-nsqd.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:{{$.Values.nsqd.tcpPort}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
         - name: "NSQ_CONSUMER_TOPIC"
           value: "metrics"
         - name: "NSQ_ENDPOINTS"
-          value: "[{{range $i := until $nsqdNodeCount}}\"http://drycc-nsqd-{{$i}}.drycc-nsqd.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.nsqd.http_port}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
-{{- if ne .Values.global.redis_location "off-cluster" }}
+          value: "[{{range $i := until $nsqdNodeCount}}\"http://drycc-nsqd-{{$i}}.drycc-nsqd.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:{{$.Values.nsqd.httpPort}}\"{{if lt (add 1 $i) $nsqdNodeCount}}, {{end}}{{end}}]"
+{{- if ne .Values.global.redisLocation "off-cluster" }}
         - name: DRYCC_REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
               name: redis-creds
               key: password
         - name: "REDIS_SERVERS"
-          value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_REDIS_PASSWORD)@drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.cluster_domain}}:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
+          value: "[{{range $i := until $redisNodeCount}}\":$(DRYCC_REDIS_PASSWORD)@drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:{{$.Values.redis.port}}\"{{if lt (add 1 $i) $redisNodeCount}}, {{end}}{{end}}]"
         volumeMounts:
         - name: redis-creds
           mountPath: /var/run/secrets/drycc/redis/creds
diff --git a/charts/monitor/values.yaml b/charts/monitor/values.yaml
@@ -1,10 +1,10 @@
 grafana:
-  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"
   persistence:
     enabled: false
     accessMode: ReadWriteOnce
@@ -15,17 +15,17 @@ grafana:
   environment:
     ALLOW_SIGN_UP: false
 telegraf:
-  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"
 
 nsqd:
   replicas: 1
-  tcp_port: 4150
-  http_port: 4151
+  tcpPort: 4150
+  httpPort: 4151
 
 redis:
   replicas: 1
@@ -37,30 +37,30 @@ global:
   # Valid values are:
   # - on-cluster: Run Influxdb within the Kubernetes cluster
   # - off-cluster: Influxdb is running outside of the cluster and credentials and connection information will be provided.
-  influxdb_location: "on-cluster"
+  influxdbLocation: "on-cluster"
   # Set the location of Workflow's grafana instance
   #
   # 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"
   # 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"
   # Role-Based Access Control for Kubernetes >= 1.5
-  use_rbac: false
-  ingress_class: ""
+  rbac: false
+  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 drycc certificates
-  cert_manager_enabled: true
+  certManagerEnabled: true

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`	`# Define global role with the default system:aggregate-to-view cluster role and the two rules we just created`
`3`	`3`	`kind: ClusterRole`
`4`	`4`	`apiVersion: rbac.authorization.k8s.io/v1`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{{- if eq .Values.global.grafana_location "on-cluster" }}`
	`1`	`+{{- if eq .Values.global.grafanaLocation "on-cluster" }}`
`2`	`2`	`apiVersion: v1`
`3`	`3`	`kind: Service`
`4`	`4`	`metadata:`