update image & change image tag usage (#111)

Signed-off-by: André Bauer <[email protected]>
kokuwaio · Jul 6, 2022 · 2219919 · 2219919
1 parent 9eae38b
commit 2219919
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: fluentd-elasticsearch
-version: 13.5.0
-appVersion: 4.0.0
+version: 13.6.0
+appVersion: v4.1.0
 type: application
 home: https://www.fluentd.org/
 description: A Fluentd Helm chart for Kubernetes with Elasticsearch output

diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md
@@ -128,8 +128,8 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `hostLogDir.varLog`                                     | Specify where fluentd can find var log                                            | `/var/log`                                          |
 | `hostLogDir.dockerContainers`                           | Specify where fluentd can find logs for docker container                          | `/var/lib/docker/containers`                        |
 | `hostLogDir.libSystemdDir`                              | Specify where fluentd can find logs for lib Systemd                               | `/usr/lib64`                                        |
-| `image.repository`                                      | Image                                                                             | `quay.io/fluentd_elasticsearch/fluentd`             |
-| `image.tag`                                             | Image tag                                                                         | `v4.0.0`                                            |
+| `image.repository`                                      | Image repository                                                                  | `quay.io/fluentd_elasticsearch/fluentd`             |
+| `image.tag`                                             | Image tag (uses appVersion from Chart.yaml as default)                            | ``                                                  |
 | `image.pullPolicy`                                      | Image pull policy                                                                 | `IfNotPresent`                                      |
 | `image.pullSecrets`                                     | Image pull secrets                                                                | ``                                                  |
 | `livenessProbe.enabled`                                 | Whether to enable livenessProbe                                                   | `true`                                              |

diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml
@@ -41,7 +41,7 @@ spec:
 {{- end }}
       containers:
       - name: {{ include "fluentd-elasticsearch.fullname" . }}
-        image:  "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image:  "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         env:
         - name: FLUENTD_ARGS

diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml
@@ -1,9 +1,10 @@
 image:
   repository: quay.io/fluentd_elasticsearch/fluentd
-## Specify an imagePullPolicy (Required)
-## It's recommended to change this to 'Always' if the image tag is 'latest'
-## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
-  tag: v4.0.0
+  # if empty uses appVersion from Chart.yaml as default image tag
+  tag: ""
+  ## Specify an imagePullPolicy (Required)
+  ## It's recommended to change this to 'Always' if the image tag is 'latest'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.