From a3b1d1edd3cf158cdb2796c599099d9672f7f3cb Mon Sep 17 00:00:00 2001 From: Muhammad Abduh Date: Mon, 29 Jul 2024 14:58:06 +0700 Subject: [PATCH] fix: fallback to default if image repository empty --- .gitignore | 1 + modules/firehose/driver.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3e4f4add..81f15135 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ entropy*.dev.yml test_*.yml test_*.json requests.http +entropy.yaml diff --git a/modules/firehose/driver.go b/modules/firehose/driver.go index f51a0d37..95c15fc0 100644 --- a/modules/firehose/driver.go +++ b/modules/firehose/driver.go @@ -304,12 +304,18 @@ func (fd *firehoseDriver) getHelmRelease(res resource.Resource, conf Config, rc.Namespace = conf.Namespace rc.ForceUpdate = true rc.Version = conf.ChartValues.ChartVersion + + imageRepository := fd.conf.ChartValues.ImageRepository + if conf.ChartValues.ImageRepository != "" { + imageRepository = conf.ChartValues.ImageRepository + } + rc.Values = map[string]any{ labelsConfKey: modules.CloneAndMergeMaps(deploymentLabels, entropyLabels), "replicaCount": conf.Replicas, "firehose": map[string]any{ "image": map[string]any{ - "repository": conf.ChartValues.ImageRepository, + "repository": imageRepository, "pullPolicy": conf.ChartValues.ImagePullPolicy, "tag": conf.ChartValues.ImageTag, },