From 77e1b7660cf9f235a22d940d83aac3f88c5eeb52 Mon Sep 17 00:00:00 2001
From: gitlawr <lawrleegle@gmail.com>
Date: Thu, 10 Dec 2020 17:43:37 +0800
Subject: [PATCH] Specify images in harvester values explicitly

In this way, we don't need to update both harvester and installer when bumping image version.
Installer can get required images by reading the values file
---
 Dockerfile.dapper                   |  2 +
 deploy/charts/harvester/Chart.yaml  |  1 +
 deploy/charts/harvester/values.yaml | 58 ++++++++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 78eac9a06fd..2b3eab35871 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -10,6 +10,8 @@ RUN apt-get update -qq && apt-get install -y --no-install-recommends \
         zstd \
     && rm -rf /var/lib/apt/lists/*
 
+# install yq
+RUN GO111MODULE=on go get github.com/mikefarah/yq/v3@3.4.1
 # set up helm
 ENV HELM_VERSION v3.4.1
 ENV HELM_URL=https://get.helm.sh/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
diff --git a/deploy/charts/harvester/Chart.yaml b/deploy/charts/harvester/Chart.yaml
index 7d6d0459fa4..462c5a6fe2f 100644
--- a/deploy/charts/harvester/Chart.yaml
+++ b/deploy/charts/harvester/Chart.yaml
@@ -51,6 +51,7 @@ dependencies:
     repository: file://dependency_charts/multus
     condition: multus.enabled
   - name: minio
+    # Note: Update minio image in harvester values.yaml when this version is updated.
     version: 8.0.5
     repository: https://helm.min.io
     condition: minio.enabled
diff --git a/deploy/charts/harvester/values.yaml b/deploy/charts/harvester/values.yaml
index 7ead8c8f5e6..b1a9e2cca1e 100644
--- a/deploy/charts/harvester/values.yaml
+++ b/deploy/charts/harvester/values.yaml
@@ -27,7 +27,30 @@ tags:
 
 ## Specify the parameters to override the sub-chart.
 ##
-kubevirt-operator: {}
+kubevirt-operator:
+  containers:
+    operator:
+      image:
+        repository: kubevirt/virt-operator
+        tag: &kubevirtVersion v0.35.0
+    ## The following four images are placeholder for images in use.
+    ## They are not used by the kubevirt-operator chart.
+    controller:
+      image:
+        repository: kubevirt/virt-controller
+        tag: *kubevirtVersion
+    handler:
+      image:
+        repository: kubevirt/virt-handler
+        tag: *kubevirtVersion
+    api:
+      image:
+        repository: kubevirt/virt-api
+        tag: *kubevirtVersion
+    launcher:
+      image:
+        repository: kubevirt/virt-launcher
+        tag: *kubevirtVersion
 
 ## Specify the parameters to override the sub-chart.
 ##
@@ -64,7 +87,28 @@ kubevirt:
 
 ## Specify the parameters to override the sub-chart.
 ##
-cdi-operator: {}
+cdi-operator:
+  containers:
+    operator:
+      image:
+        repository: kubevirt/cdi-operator
+        tag: &cdiVersion v1.26.1
+    controller:
+      image:
+        repository: kubevirt/cdi-controller
+        tag: *cdiVersion
+    importer:
+      image:
+        repository: kubevirt/cdi-importer
+        tag: *cdiVersion
+    apiserver:
+      image:
+        repository: kubevirt/cdi-apiserver
+        tag: *cdiVersion
+    uploadproxy:
+      image:
+        repository: kubevirt/cdi-uploadproxy
+        tag: *cdiVersion
 
 ## Specify the parameters to override the sub-chart.
 ##
@@ -79,6 +123,12 @@ minio:
   ##
   enabled: true
 
+  ## Specify the image.
+  ##
+  image:
+    repository: minio/minio
+    tag: RELEASE.2020-11-19T23-48-16Z
+
   ## Specify the mode.
   ##
   mode: distributed
@@ -380,6 +430,10 @@ multus:
   ## defaults to "false", this will be enabled in ISO mode installation.
   enabled: false
 
+  image:
+    repository: nfvpe/multus
+    tag: v3.6
+
   ## Specify the cni hostPath, default to use the k3s cni hostPath
   hostPath:
     cniConfDir: /var/lib/rancher/k3s/agent/etc/cni/net.d