Automatically use Chart Version to pull the correct operator version

Author: J12934

operator/Chart.yaml

@@ -4,13 +4,8 @@ description: secureCodeBox Operator to automate the execution of security scans
 
 type: application
 
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 0.2.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application.
-appVersion: 1.18.0
+# version - gets automatically set to the secureCodeBox release version when the helm charts gets published
+version: v2.0.0-alpha1
 
 dependencies:
   - name: minio

operator/templates/manager/manager.yaml

@@ -20,11 +20,7 @@ spec:
             - /manager
           args:
             - --enable-leader-election
-          {{- if .Values.image.digest }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}@{{ .Values.image.digest }}"
-          {{- else }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          {{- end }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.Version }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: manager
           env:
@@ -74,14 +70,9 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.s3.keySecret }}
                   key: secretkey
-            {{- end }}
-            {{- if .Values.lurcher.image.digest }}
-            - name: LURCHER_IMAGE
-              value: "{{ .Values.lurcher.image.registry }}/{{ .Values.lurcher.image.repository }}@{{ .Values.lurcher.image.digest }}"
-            {{- else }}
+            {{- end }}          
             - name: LURCHER_IMAGE
-              value: "{{ .Values.lurcher.image.registry }}/{{ .Values.lurcher.image.repository }}:{{ .Values.lurcher.image.tag }}"
-            {{- end }}
+              value: "{{ .Values.lurcher.image.repository }}:{{ .Values.lurcher.image.tag | default .Chart.Version }}"
             - name: LURCHER_PULL_POLICY
               value: {{ .Values.lurcher.image.pullPolicy }}
           resources:

operator/values.yaml

@@ -6,18 +6,16 @@
 telemetryEnabled: true
 
 image:
-  registry: docker.io
-  repository: scbexperimental/operator
-  tag: latest
-  digest: null
+  repository: docker.io/scbexperimental/operator
+  # image.tag -- defaults to the charts version
+  tag: null
   pullPolicy: Always
 
 lurcher:
   image:
-    registry: docker.io
-    repository: scbexperimental/lurcher
+    repository: docker.io/scbexperimental/lurcher
+    # lurcher.image.tag -- defaults to the charts version
     tag: null
-    digest: "sha256:0e9f18f85809fb8c042543657d340949db14e81fc727bf9fab4421befd317850"
     pullPolicy: IfNotPresent
 
 minio: