Merge pull request #803 from kubecost/mmd-cost-model-full-image

Add a "hidden" value option to specify full image names
kubecost · Mar 8, 2021 · 5b4caf8 · 5b4caf8
2 parents ea46f3c + b8088f2
commit 5b4caf8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/cost-analyzer/templates/cost-analyzer-checks-template.yaml b/cost-analyzer/templates/cost-analyzer-checks-template.yaml
@@ -27,7 +27,11 @@ spec:
           containers:
           - name: cost-analyzer-checks
           {{- if .Values.kubecostChecks }}
+          {{- if .Values.kubecostChecks.fullImageName }}
+            image: {{ .Values.kubecostChecks.fullImageName }}
+          {{- else }}
             image: {{ .Values.kubecostChecks.image }}:prod-{{ $.Chart.AppVersion }}
+          {{ end }}
           {{- else }}
             image: gcr.io/kubecost1/checks:prod-{{ $.Chart.AppVersion }}
           {{ end }}

diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml
@@ -216,7 +216,9 @@ spec:
 {{ end }}
       containers:
         {{- if .Values.kubecostModel }}
-        {{- if .Values.imageVersion}}
+        {{- if .Values.kubecostModel.fullImageName }}
+        - image: {{ .Values.kubecostModel.fullImageName }}
+        {{- else if .Values.imageVersion }}
         - image: {{ .Values.kubecostModel.image }}:{{ .Values.imageVersion }}
         {{- else }}
         - image: {{ .Values.kubecostModel.image }}:prod-{{ $.Chart.AppVersion }}
@@ -546,7 +548,9 @@ spec:
             - name: CUSTOM_ALERTS_ENABLED
               value: {{ (quote .Values.global.notifications.alertConfigs.enabled) | default (quote false) }}
         {{- if .Values.kubecostFrontend }}
-        {{- if .Values.imageVersion}}
+        {{- if .Values.kubecostFrontend.fullImageName }}
+        - image: {{ .Values.kubecostFrontend.fullImageName }}
+        {{- else if .Values.imageVersion }}
         - image: {{ .Values.kubecostFrontend.image }}:{{ .Values.imageVersion }}
         {{- else }}
         - image: {{ .Values.kubecostFrontend.image }}:prod-{{ $.Chart.AppVersion }}
@@ -589,7 +593,9 @@ spec:
             periodSeconds: 10
             failureThreshold: 200
         {{- if .Values.kubecost }}
-        {{- if .Values.imageVersion}}
+        {{- if .Values.kubecost.fullImageName }}
+        - image: {{ .Values.kubecost.fullImageName }}
+        {{- else if .Values.imageVersion}}
         - image: {{ .Values.kubecost.image }}:{{ .Values.imageVersion }}
         {{- else }}
         - image: {{ .Values.kubecost.image }}:prod-{{ $.Chart.AppVersion }}