helm-chart: Streamline image values and usage (#1550)

Signed-off-by: Marco Franssen <[email protected]>

Author: marcofranssen

.github/renovate-config.js

@@ -23,16 +23,21 @@ module.exports = {
       customType: "regex",
       matchStringsStrategy: "any",
       fileMatch: [
+        "charts/fluent-operator/Chart.yaml",
+        "charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml",
+        "charts/fluent-operator/charts/fluentd-crds/Chart.yaml",
         "charts/fluent-operator/values.yaml",
+        "cmd/fluent-watcher/fluentbit/VERSION",
         "config/.*\\.yaml",
         "docs/.*\\.yaml",
         "manifests/.*\\.yaml",
-        "cmd/fluent-watcher/fluentbit/VERSION",
       ],
       matchStrings: [
         '# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+depName=(?<depName>\\S+?)\\s+tag:\\s+"(?<currentValue>.+?)"\\s+?',
+        "# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+depName=(?<depName>\\S+?)\\s+tag:\\s+(?<currentValue>.+?)\\s+?",
         "# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+depName=(?<depName>.+?)\\s+image:\\s*(?:.?)*:(?<currentValue>.*?)\\s+?",
         "# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+depName=(?<depName>.+?)\\s+version=\\n(?<currentValue>.+?)\\n",
+        '# renovate:\\s+datasource=(?<datasource>\\S+?)\\s+depName=(?<depName>.+?)\\s+appVersion:\\s+"(?<currentValue>.+?)"\\n',
       ],
       extractVersionTemplate: "^v(?<version>.*)$",
     },

charts/fluent-operator/Chart.yaml

@@ -7,7 +7,8 @@ keywords:
   - fluentd
   - operator
 version: 3.3.0
-appVersion: 3.3.0
+# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
+appVersion: "3.3.0"
 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
 home: https://www.fluentd.org/
 sources:

charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml

@@ -20,4 +20,5 @@ version: 3.3.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
+# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
 appVersion: "3.3.0"

charts/fluent-operator/charts/fluentd-crds/Chart.yaml

@@ -20,4 +20,5 @@ version: 3.3.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
+# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
 appVersion: "3.3.0"

charts/fluent-operator/templates/_helpers.tpl

@@ -72,3 +72,14 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Util function for generating the image URL based on the provided options.
+*/}}
+{{- define "fluent-operator.image" -}}
+{{- $defaultTag := index . 1 -}}
+{{- with index . 0 -}}
+{{- if .registry -}}{{ printf "%s/%s" .registry .repository }}{{- else -}}{{- .repository -}}{{- end -}}
+{{- if .digest -}}{{ printf "@%s" .digest }}{{- else -}}{{ printf ":%s" (default $defaultTag .tag) }}{{- end -}}
+{{- end }}
+{{- end }}

charts/fluent-operator/templates/fluent-operator-deployment.yaml

@@ -36,7 +36,7 @@ spec:
           path: /var/run/docker.sock
       initContainers:
       - name: setenv
-        image: {{ .Values.operator.initcontainer.repository }}:{{ .Values.operator.initcontainer.tag }}
+        image: {{ template "fluent-operator.image" (tuple .Values.operator.initcontainer.image "") }}
         command:
         - /bin/sh
         - '-c'
@@ -56,7 +56,7 @@ spec:
         emptyDir: {}
       initContainers:
       - name: setenv
-        image: {{ .Values.operator.initcontainer.repository }}:{{ .Values.operator.initcontainer.tag }}
+        image: {{ template "fluent-operator.image" (tuple .Values.operator.initcontainer.image "") }}
         command:
         - /bin/sh
         - '-c'
@@ -73,7 +73,7 @@ spec:
           emptyDir: {}
       initContainers:
       - name: setenv
-        image: {{ .Values.operator.initcontainer.repository }}:{{ .Values.operator.initcontainer.tag }}
+        image: {{ template "fluent-operator.image" (tuple .Values.operator.initcontainer.image "") }}
         command:
         - /bin/sh
         - '-c'
@@ -87,7 +87,7 @@ spec:
       {{- end }}
       containers:
       - name: fluent-operator
-        image: {{ .Values.operator.container.repository }}:{{ .Values.operator.container.tag }}
+        image: {{ template "fluent-operator.image" (tuple .Values.operator.image $.Chart.AppVersion) }}
         {{- if .Values.operator.securityContext }}
         securityContext:
           {{- toYaml .Values.operator.securityContext | nindent 10 }}

charts/fluent-operator/templates/fluentbit-fluentBit.yaml

@@ -16,8 +16,8 @@ spec:
   {{- else if .Values.fluentbit.hostNetwork }}
   dnsPolicy: ClusterFirstWithHostNet
   {{- end }}
-  image: {{ .Values.fluentbit.image.repository }}:{{ .Values.fluentbit.image.tag }}
-  {{- with .Values.fluentbit.imagePullSecrets }}
+  image: {{ template "fluent-operator.image" (tuple .Values.fluentbit.image "") }}
+  {{- if .Values.fluentbit.imagePullSecrets }}
   imagePullSecrets:
     {{- toYaml . | nindent 4 }}
   {{- end }}

charts/fluent-operator/templates/fluentbit-fluentbit-edge.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: {{ .Values.fluentbit.image.repository }}:{{ .Values.fluentbit.image.tag }}
+  image: {{ template "fluent-operator.image" (tuple .Values.fluentbit.image "") }}
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/

charts/fluent-operator/templates/fluentd-fluentd.yaml

@@ -14,7 +14,7 @@ spec:
         bind: 0.0.0.0
         port: {{ .port }}
   replicas: {{ .replicas }}
-  image: {{ .image.repository }}:{{ .image.tag }}
+  image: {{ template "fluent-operator.image" (tuple .Values.fluentd.image "") }}
   {{- with .imagePullSecrets }}
   imagePullSecrets:
     {{- toYaml . | nindent 4 }}

charts/fluent-operator/values.yaml

@@ -12,8 +12,10 @@ operator:
   # The init container is to get the actual storage path of the docker log files so that it can be mounted to collect the logs.
   # see https://github.com/fluent/fluent-operator/blob/master/manifests/setup/fluent-operator-deployment.yaml#L26
   initcontainer:
-    repository: "docker"
-    tag: "20.10"
+    image:
+      registry: docker.io
+      repository: docker
+      tag: "20.10"
 
     resources:
       limits:
@@ -22,9 +24,10 @@ operator:
       requests:
         cpu: 50m
         memory: 64Mi
-  container:
-    repository: "kubesphere/fluent-operator"
-    tag: "latest"
+  image:
+    registry: ghcr.io
+    repository: fluent/fluent-operator/fluent-operator
+    tag: ""
   # If set to false, this will disable the creation of ClusterRole, ClusterRoleBinding,
   # Deployment, and ServiceAccount resources to avoid conflicts when deploying multiple instances.
   enable: true
@@ -96,9 +99,11 @@ fluentbit:
     failureThreshold: 8
 
   image:
-    repository: "ghcr.io/fluent/fluent-operator/fluent-bit"
-    tag: 4.0.0
+    registry: ghcr.io
+    repository: fluent/fluent-operator/fluent-bit
     # renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-bit
+    tag: "4.0.0"
+
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
@@ -424,8 +429,11 @@ fluentd:
   mode: "collector"
   port: 24224
   image:
-    repository: "ghcr.io/fluent/fluent-operator/fluentd"
-    tag: "v1.17.1"
+    registry: ghcr.io
+    repository: fluent/fluent-operator/fluentd
+    # renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluentd
+    tag: v1.17.1
+
   # Numbers of the Fluentd instance
   # Applicable when the mode is "collector", and will be ignored when the mode is "agent"
   replicas: 1