chore(monitor): remove docker keyword from charts

Author: duanhongyi

charts/monitor/templates/monitor-grafana-deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.grafana.docker_tag }}
+    component.drycc.cc/version: {{ .Values.grafana.image_tag }}
 spec:
   replicas: 1
   strategy:
@@ -24,8 +24,8 @@ spec:
     spec:
       containers:
       - name: drycc-monitor-grafana
-        image: {{.Values.grafana.docker_registry}}{{.Values.grafana.org}}/grafana:{{.Values.grafana.docker_tag}}
-        imagePullPolicy: {{.Values.grafana.pull_policy}}
+        image: {{.Values.grafana.image_registry}}{{.Values.grafana.org}}/grafana:{{.Values.grafana.image_tag}}
+        imagePullPolicy: {{.Values.grafana.image_pull_policy}}
 {{- if or (.Values.grafana.limits_cpu) (.Values.grafana.limits_memory)}}
         resources:
           limits:

charts/monitor/templates/monitor-telegraf-daemon.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.telegraf.docker_tag }}
+    component.drycc.cc/version: {{ .Values.telegraf.image_tag }}
 spec:
   selector:
     matchLabels:
@@ -22,8 +22,8 @@ spec:
       serviceAccount: drycc-monitor-telegraf
       containers:
         - name: drycc-monitor-telegraf
-          image: {{.Values.telegraf.docker_registry}}{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.docker_tag}}
-          imagePullPolicy: {{.Values.telegraf.pull_policy}}
+          image: {{.Values.telegraf.image_registry}}{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.image_tag}}
+          imagePullPolicy: {{.Values.telegraf.image_pull_policy}}
 {{- if or (.Values.telegraf.limits_cpu) (.Values.telegraf.limits_memory)}}
           resources:
             limits:

charts/monitor/templates/monitor-telegraf-deployment.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     heritage: drycc
   annotations:
-    component.drycc.cc/version: {{ .Values.telegraf.docker_tag }}
+    component.drycc.cc/version: {{ .Values.telegraf.image_tag }}
 spec:
   replicas: 1
   selector:
@@ -25,8 +25,8 @@ spec:
       serviceAccount: drycc-monitor-telegraf
       containers:
         - name: drycc-monitor-telegraf
-          image: {{.Values.telegraf.docker_registry}}{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.docker_tag}}
-          imagePullPolicy: {{.Values.telegraf.pull_policy}}
+          image: {{.Values.telegraf.image_registry}}{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.image_tag}}
+          imagePullPolicy: {{.Values.telegraf.image_pull_policy}}
 {{- if or (.Values.telegraf.limits_cpu) (.Values.telegraf.limits_memory)}}
           resources:
             limits:

charts/monitor/values.yaml

@@ -1,8 +1,8 @@
 grafana:
   org: "drycc"
-  pull_policy: "Always"
-  docker_tag: "canary"
-  docker_registry: ""
+  image_pull_policy: "Always"
+  image_tag: "canary"
+  image_registry: ""
   # limits_cpu: "100m"
   # limits_memory: "50Mi"
   persistence:
@@ -16,9 +16,9 @@ grafana:
     ALLOW_SIGN_UP: false
 telegraf:
   org: "drycc"
-  pull_policy: "Always"
-  docker_tag: "canary"
-  docker_registry: ""
+  image_pull_policy: "Always"
+  image_tag: "canary"
+  image_registry: ""
   # limits_cpu: "100m"
   # limits_memory: "50Mi"
 

deploy.mk

@@ -1,9 +1,9 @@
 install:
-	helm upgrade monitor ../charts/monitor --install --namespace drycc --set grafana.org=${IMAGE_PREFIX},grafana.docker_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.docker_tag=${VERSION}
+	helm upgrade monitor ../charts/monitor --install --namespace drycc --set grafana.org=${IMAGE_PREFIX},grafana.image_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.image_tag=${VERSION}
 
 
 upgrade: 
-	helm upgrade monitor ../charts/monitor --namespace drycc --set grafana.org=${IMAGE_PREFIX},grafana.docker_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.docker_tag=${VERSION}
+	helm upgrade monitor ../charts/monitor --namespace drycc --set grafana.org=${IMAGE_PREFIX},grafana.image_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.image_tag=${VERSION}
 
 uninstall:
 	helm delete monitor