update Istio CNI Helm install instructions and add to test (#14814)

* update Istio CNI Helm install instructions and add to test

* test fix

content/en/docs/setup/additional-setup/cni/index.md

@@ -109,14 +109,16 @@ Please take a look at [race condition & mitigation](#race-condition--mitigation)
 
 ### Installing with Helm
 
-The Istio CNI and Istio discovery chart use different values that require you set the following, either in an overrides values file or at your command prompt when installing the `istiod` chart, to manage network annotations when chaining CNI plugins:
+Following the [Install with Helm](/docs/setup/install/helm/#installation-steps) installation steps, there are some additional Helm values that are required to be set. You can
+set these either through an override values file or via the command line when installing the `istiod` chart. These are:
 
 * `values.istio_cni.enabled` should be set to the same value as `values.cni.enabled`.
-
 * `values.istio_cni.chained` should be set to the same value as `values.cni.chained`.
 
+For example:
+
 {{< text bash >}}
-$  helm install istiod istio/istiod -n istio-system --set values.istio_cni.enabled=true --wait
+$ helm install istiod istio/istiod -n istio-system --set istio_cni.enabled=true --wait
 {{< /text >}}
 
 ### Hosted Kubernetes settings

content/en/docs/setup/additional-setup/cni/snips.sh

@@ -37,7 +37,7 @@ helm install istio-cni istio/cni -n kube-system --wait
 }
 
 snip_installing_with_helm_1() {
- helm install istiod istio/istiod -n istio-system --set values.istio_cni.enabled=true --wait
+helm install istiod istio/istiod -n istio-system --set istio_cni.enabled=true --wait
 }
 
 ! IFS=$'\n' read -r -d '' snip_hosted_kubernetes_settings_1 <<\ENDSNIP

content/en/docs/setup/additional-setup/cni/test.sh

@@ -28,6 +28,20 @@ get_productpage() {
 }
 
 # @setup profile=none
+
+# Test helm install snip
+kubectl create namespace istio-system
+helm --set global.tag="${ISTIO_IMAGE_VERSION=SHOULD_BE_SET}"."${ISTIO_LONG_SHA=latest}" install istio-base manifests/charts/base -n istio-system --set defaultRevision=default
+_rewrite_helm_repo snip_installing_with_helm_1
+_rewrite_helm_repo snip_install_istio_with_cni_plugin_2
+_wait_for_deployment istio-system istiod
+_wait_for_daemonset kube-system istio-cni-node
+helm delete istio-cni -n kube-system
+helm delete istiod -n istio-system
+helm delete istio-base -n istio-system
+kubectl delete ns istio-system
+
+# Test istioctl install snip
 snip_install_istio_with_cni_plugin_1
 _wait_for_deployment istio-system istiod
 _wait_for_daemonset istio-system istio-cni-node