Get operator tag from .Chart.AppVersion (#166)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubevault · May 28, 2022 · f212b1b · f212b1b
1 parent 9db93b4
commit f212b1b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/charts/kubevault-operator/README.md b/charts/kubevault-operator/README.md
@@ -54,7 +54,7 @@ The following table lists the configurable parameters of the `kubevault-operator
 | registryFQDN                         | Docker registry fqdn used to pull docker images Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image}                                                                                                                                                                                                                                                      | <code>""</code>                           |
 | operator.registry                    | Docker registry used to pull KubeVault operator image                                                                                                                                                                                                                                                                                                                               | <code>kubevault</code>                    |
 | operator.repository                  | KubeVault operator container image                                                                                                                                                                                                                                                                                                                                                  | <code>vault-operator</code>               |
-| operator.tag                         | KubeVault operator container image tag                                                                                                                                                                                                                                                                                                                                              | <code>v0.7.0</code>                       |
+| operator.tag                         | KubeVault operator container image tag                                                                                                                                                                                                                                                                                                                                              | <code>""</code>                           |
 | operator.resources                   | Compute Resources required by the operator container                                                                                                                                                                                                                                                                                                                                | <code>{}</code>                           |
 | operator.securityContext             | requests: cpu: 100m memory: 128Mi Security options the operator container should run with                                                                                                                                                                                                                                                                                           | <code>{}</code>                           |
 | imagePullSecrets                     | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace. <br> Example: <br> `helm template charts/kubevault-operator \` <br> `--set imagePullSecrets[0].name=sec0 \` <br> `--set imagePullSecrets[1].name=sec1`                                                                                                                                     | <code>[]</code>                           |

diff --git a/charts/kubevault-operator/templates/deployment.yaml b/charts/kubevault-operator/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
       - name: operator
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}
-        image: {{ include "operator.registry" . }}/{{ .Values.operator.repository }}:{{ .Values.operator.tag }}
+        image: {{ include "operator.registry" . }}/{{ .Values.operator.repository }}:{{ .Values.operator.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.imagePullPolicy  }}
         args:
         - operator

diff --git a/charts/kubevault-operator/values.yaml b/charts/kubevault-operator/values.yaml
@@ -28,7 +28,7 @@ operator:
   # KubeVault operator container image
   repository: vault-operator
   # KubeVault operator container image tag
-  tag: v0.7.0
+  tag: ""
   # Compute Resources required by the operator container
   resources: {}
   # requests:

diff --git a/charts/kubevault-webhook-server/README.md b/charts/kubevault-webhook-server/README.md
@@ -54,7 +54,7 @@ The following table lists the configurable parameters of the `kubevault-webhook-
 | registryFQDN                         | Docker registry fqdn used to pull docker images Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image}                                                                                                                                                                                                                                                            | <code>""</code>                           |
 | server.registry                      | Docker registry used to pull KubeVault webhook server image                                                                                                                                                                                                                                                                                                                               | <code>kubevault</code>                    |
 | server.repository                    | KubeVault webhook server container image                                                                                                                                                                                                                                                                                                                                                  | <code>vault-operator</code>               |
-| server.tag                           | KubeVault webhook server container image tag                                                                                                                                                                                                                                                                                                                                              | <code>v0.7.0</code>                       |
+| server.tag                           | KubeVault webhook server container image tag                                                                                                                                                                                                                                                                                                                                              | <code>""</code>                           |
 | server.resources                     | Compute Resources required by the webhook server container                                                                                                                                                                                                                                                                                                                                | <code>{}</code>                           |
 | server.securityContext               | requests: cpu: 100m memory: 128Mi Security options the webhook server container should run with                                                                                                                                                                                                                                                                                           | <code>{}</code>                           |
 | imagePullSecrets                     | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace. <br> Example: <br> `helm template charts/kubevault-webhook-server \` <br> `--set imagePullSecrets[0].name=sec0 \` <br> `--set imagePullSecrets[1].name=sec1`                                                                                                                                     | <code>[]</code>                           |

diff --git a/charts/kubevault-webhook-server/templates/deployment.yaml b/charts/kubevault-webhook-server/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
       - name: operator
         securityContext:
           {{- toYaml .Values.server.securityContext | nindent 10 }}
-        image: {{ include "server.registry" . }}/{{ .Values.server.repository }}:{{ .Values.server.tag }}
+        image: {{ include "server.registry" . }}/{{ .Values.server.repository }}:{{ .Values.server.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.imagePullPolicy  }}
         args:
         - run

diff --git a/charts/kubevault-webhook-server/values.yaml b/charts/kubevault-webhook-server/values.yaml
@@ -28,7 +28,7 @@ server:
   # KubeVault webhook server container image
   repository: vault-operator
   # KubeVault webhook server container image tag
-  tag: v0.7.0
+  tag: ""
   # Compute Resources required by the webhook server container
   resources: {}
   # requests: