allow message and heartbeat image and tag to be overwrite (#858)

* allow message nad heartbeat image and tag to be overwrite

* comment out tag so it can use appVerion or specific overwrite

Author: longshuicy

deployments/kubernetes/charts/clowder2/templates/heartbeat/deployment.yaml

@@ -30,8 +30,8 @@ spec:
         - name: extractors-heartbeat
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "clowder/clowder2-heartbeat:main"
-          imagePullPolicy: Always
+          image: "{{ .Values.heartbeat.image.repository }}:{{ .Values.heartbeat.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.heartbeat.image.pullPolicy }}
           env:
             - name: MONGODB_URL
               value: mongodb://{{ include "clowder2.name" . }}-mongodb:27017

deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml

@@ -30,8 +30,8 @@ spec:
         - name: extractors-messages
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "clowder/clowder2-messages:main"
-          imagePullPolicy: Always
+          image: "{{ .Values.message.image.repository }}:{{ .Values.message.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.message.image.pullPolicy }}
           env:
             - name: MONGODB_URL
               value: mongodb://{{ include "clowder2.name" . }}-mongodb:27017

deployments/kubernetes/charts/clowder2/values.yaml

@@ -168,25 +168,31 @@ rabbitmq:
     #storageClass: csi-cinder-sc-retain
 
 # ----------------------------------------------------------------------
-# EXTRACTORS
+# DEFAULT EXTRACTOR SERVICES
 # ----------------------------------------------------------------------
+message:
+  image:
+    repository: clowder/clowder2-messages
+#    tag: main
+    pullPolicy: Always
+
+heartbeat:
+  image:
+    repository: clowder/clowder2-heartbeat
+#    tag: main
+    pullPolicy: Always
 
+
+# ----------------------------------------------------------------------
+# EXTRACTORS
+# ----------------------------------------------------------------------
 ## list of extractors to be installed. Each extractor should have the
 ## following fields:
 ## enabled      : true/false - should the extractor be installed
 ## image        : dokeer/image:tag - the extractor docker image
 ## replicaCount : number - the number of this extractor to install
 ## env          : additional environment variables to pass to extractor.
 extractors:
-#  file-digest:
-#    image: clowder/extractors-digest:2.2.4
-#    # enabled: true
-#    # replicaCount: 1
-#    # pullPolicy: Always
-#    # imagePullSecrets: regcred
-#    # env:
-#    #   - name: extractor.bump.sh
-#    #     value: "bar"
   wordcount:
     image: clowder/extractors-wordcount:latest
   image-preview: