Skip to content

Commit

Permalink
Specify images in harvester values explicitly
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitlawr authored and guangbochen committed Dec 11, 2020
1 parent a34a248 commit 77e1b76
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/charts/harvester/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
58 changes: 56 additions & 2 deletions deploy/charts/harvester/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
##
Expand Down Expand Up @@ -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.
##
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 77e1b76

Please sign in to comment.