From 096541ac8ec8df6522a31151c945d53c068d0799 Mon Sep 17 00:00:00 2001 From: Ryan Hartje Date: Thu, 12 Apr 2018 12:54:31 -0400 Subject: [PATCH] added check for clientOnly flag --- cmd/helm/init.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/helm/init.go b/cmd/helm/init.go index bec222cb1..0d85cf36a 100644 --- a/cmd/helm/init.go +++ b/cmd/helm/init.go @@ -324,7 +324,8 @@ func (i *initCmd) run() error { fmt.Fprintln(i.out, "Not installing Tiller due to 'client-only' flag having been set") } - if version.BuildMetadata == "unreleased" && !i.opts.UseCanary && len(i.opts.ImageSpec) == 0 { + needsDefaultImage := !i.clientOnly && !i.opts.UseCanary && len(i.opts.ImageSpec) == 0 && version.BuildMetadata == "unreleased" + if needsDefaultImage { fmt.Fprintf(i.out, "\nWarning: You appear to be using an unreleased version of Helm. Please either use the\n"+ "--canary-image flag, or specify your desired tiller version with --tiller-image.\n\n"+ "Ex:\n"+