Skip to content

Commit

Permalink
test: Fix hubble-relay image helm path
Browse files Browse the repository at this point in the history
'hubble-relay.image' was changed from a string to a map of strings by
commit commit bbf5377 ("Fix values scoping for newly implemented
sub-chart hubble-relay"). Fix the test helpers accordingly.

Without this helm would panic when ginkgo option
'-cilium.hubble-relay-image="docker.io/cilium/hubble-relay:latest"' is
passed as the helm command line included both 'hubble-relay.image' and
'hubble-relay.image.tag' like so:

$ helm template install/kubernetes/cilium --namespace=cilium  --set hubble-relay.image=docker.io/cilium/hubble-relay:latest  --set hubble-relay.image.tag=latest
panic: interface conversion: interface {} is string, not map[string]interface {}

goroutine 1 [running]:
helm.sh/helm/v3/pkg/strvals.(*parser).key(0xc0004c5ac0, 0xc00031a3c0, 0xc00067f800, 0xc)
	/private/tmp/helm-20200608-50972-gq0j1j/src/helm.sh/helm/pkg/strvals/parser.go:211 +0xdea

Fixes: bbf5377
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
  • Loading branch information
jrajahalme authored and joestringer committed Jun 16, 2020
1 parent 331aab4 commit 496624b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/helpers/kubectl.go
Expand Up @@ -242,7 +242,7 @@ func Init() {
"CILIUM_TAG": "global.tag",
"CILIUM_IMAGE": "agent.image",
"CILIUM_OPERATOR_IMAGE": "operator.image",
"HUBBLE_RELAY_IMAGE": "hubble-relay.image",
"HUBBLE_RELAY_IMAGE": "hubble-relay.image.repository",
} {
if v := os.Getenv(envVar); v != "" {
defaultHelmOptions[helmVar] = v
Expand Down

0 comments on commit 496624b

Please sign in to comment.