From ec7d51abc0b34c40de82e6373cd8b6b57507d2c6 Mon Sep 17 00:00:00 2001
From: Neeraj Poddar <neeraj.poddar@volunteers.acasi.info>
Date: Mon, 9 Nov 2020 20:19:29 -0700
Subject: [PATCH] Add explicit hub/tag overrides for Helm commands (#8475)

Helm charts are no longer templated at release build time to contain the correct
default hub/tag but instead point to testing hub and latest tag.

Updated docs to instruct users to explicitly set the hub and tag while executing
Helm commands.
---
 content/en/docs/setup/install/helm/index.md | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/content/en/docs/setup/install/helm/index.md b/content/en/docs/setup/install/helm/index.md
index 8ac083c193..b41e212493 100644
--- a/content/en/docs/setup/install/helm/index.md
+++ b/content/en/docs/setup/install/helm/index.md
@@ -67,21 +67,24 @@ follow the instructions below.
 1. Install the Istio discovery chart which deploys the `istiod` service:
 
     {{< text bash >}}
-    $ helm install --namespace istio-system istiod manifests/charts/istio-control/istio-discovery
+    $ helm install --namespace istio-system istiod manifests/charts/istio-control/istio-discovery \
+        --set global.hub="docker.io/istio" --set global.tag="{{< istio_full_version >}}"
     {{< /text >}}
 
 1. (Optional) Install the Istio ingress gateway chart which contains the ingress
    gateway components:
 
     {{< text bash >}}
-    $ helm install --namespace istio-system istio-ingress manifests/charts/gateways/istio-ingress
+    $ helm install --namespace istio-system istio-ingress manifests/charts/gateways/istio-ingress \
+        --set global.hub="docker.io/istio" --set global.tag="{{< istio_full_version >}}"
     {{< /text >}}
 
 1. (Optional) Install the Istio egress gateway chart which contains the egress
    gateway components:
 
     {{< text bash >}}
-    $ helm install --namespace istio-system istio-egress manifests/charts/gateways/istio-egress
+    $ helm install --namespace istio-system istio-egress manifests/charts/gateways/istio-egress \
+        --set global.hub="docker.io/istio" --set global.tag="{{< istio_full_version >}}"
     {{< /text >}}
 
 ## Verifying the installation
@@ -148,15 +151,18 @@ preserve your custom configuration during Helm upgrades.
 1. Upgrade the Istio discovery chart:
 
     {{< text bash >}}
-    $ helm upgrade --namespace istio-system istiod manifests/charts/istio-control/istio-discovery
+    $ helm upgrade --namespace istio-system istiod manifests/charts/istio-control/istio-discovery \
+        --set global.hub="docker.io/istio" --set global.tag="<version_to_upgrade>"
     {{< /text >}}
 
 1. (Optional) Upgrade the Istio ingress or egress gateway charts if installed in
    your cluster:
 
     {{< text bash >}}
-    $ helm upgrade --namespace istio-system istio-ingress manifests/charts/gateways/istio-ingress
-    $ helm upgrade --namespace istio-system istio-egress manifests/charts/gateways/istio-egress
+    $ helm upgrade --namespace istio-system istio-ingress manifests/charts/gateways/istio-ingress \
+        --set global.hub="docker.io/istio" --set "global.tag=<version_to_upgrade>"
+    $ helm upgrade --namespace istio-system istio-egress manifests/charts/gateways/istio-egress \
+        --set global.hub="docker.io/istio" --set "global.tag=<version_to_upgrade>"
     {{< /text >}}
 
 ### Canary Upgrade
@@ -178,7 +184,8 @@ gateways.
    value:
 
     {{< text bash >}}
-    $ helm install --namespace istio-system istiod-canary manifests/charts/istio-control/istio-discovery --set revision=canary
+    $ helm install --namespace istio-system istiod-canary manifests/charts/istio-control/istio-discovery --set revision=canary \
+        --set global.hub="docker.io/istio" --set global.tag=<version_to_upgrade>
     {{< /text >}}
 
 1. Verify that you have two versions of `istiod` installed in your cluster: