chore(chars): change org to image_tag

Author: duanhongyi

charts/controller/templates/controller-celery.yaml

@@ -24,7 +24,7 @@ spec:
       serviceAccount: drycc-controller
       containers:
         - name: drycc-controller-celery-high
-          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           command:
             - /bin/bash
@@ -34,7 +34,7 @@ spec:
           {{- include "controller.limits" . | indent 10 }}
           {{- include "controller.envs" . | indent 10 }}
         - name: drycc-controller-celery-middle
-          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           command:
             - /bin/bash
@@ -44,7 +44,7 @@ spec:
           {{- include "controller.limits" . | indent 10 }}
           {{- include "controller.envs" . | indent 10 }}
         - name: drycc-controller-celery-low
-          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           command:
             - /bin/bash

charts/controller/templates/controller-cronjob-daily.yaml

@@ -18,7 +18,7 @@ spec:
           restartPolicy: OnFailure
           serviceAccount: drycc-controller
           containers:
-          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.image_pull_policy}}
             name: drycc-controller-push-data-to-influxdb
             command:
@@ -27,7 +27,7 @@ spec:
             args:
               - python /app/manage.py load_db_state_to_k8s
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-app
             command:
@@ -36,7 +36,7 @@ spec:
             args:
               - python -u /app/manage.py measure_app
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-config
             command:
@@ -45,7 +45,7 @@ spec:
             args:
               - python -u /app/manage.py measure_config
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-resources
             command:
@@ -54,7 +54,7 @@ spec:
             args:
               - python -u /app/manage.py measure_resources
             {{- include "controller.envs" . | indent 12 }}
-          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-volumes
             command:

charts/controller/templates/controller-cronjob-hourly.yaml

@@ -18,7 +18,7 @@ spec:
           restartPolicy: OnFailure
           serviceAccount: drycc-controller
           containers:
-          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-app
             command:

charts/controller/templates/controller-deployment.yaml

@@ -24,7 +24,7 @@ spec:
       serviceAccount: drycc-controller
       containers:
         - name: drycc-controller
-          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.image_org}}/controller:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           livenessProbe:
             httpGet:

charts/controller/values.yaml

@@ -1,4 +1,4 @@
-org: "drycc"
+image_org: "drycc"
 image_pull_policy: "Always"
 image_tag: "canary"
 image_registry: "docker.io"