istio · ymesika · Feb 7, 2019
@@ -5,7 +5,7 @@ weight: 50
 ---
 
 This page presents details about the metrics that Istio collects when using its initial configuration. You can add and remove metrics by changing configuration at any time, but this
-is the built-in set. They can be found [here]({{< github_file >}}/install/kubernetes/helm/subcharts/mixer/templates/config.yaml)
+is the built-in set. They can be found [here]({{< github_file >}}/install/kubernetes/helm/istio/charts/mixer/templates/config.yaml)
 under the section with "kind: metric”. It uses [metric
 template](/docs/reference/config/policy-and-telemetry/templates/metric/) to define these metrics.
 

@@ -31,15 +31,6 @@ plane and the sidecars for the Istio data plane.
 
 ## Installation steps
 
-The following commands have relative references in the Istio directory. You must execute the commands in Istio's root directory.
-
-1.  Update Helm's dependencies:
-
-    {{< text bash >}}
-    $ helm repo add istio.io "https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts"
-    $ helm dep update install/kubernetes/helm/istio
-    {{< /text >}}
-
 1. Choose one of the following two **mutually exclusive** options described below.
 
     {{< tip >}}

@@ -30,7 +30,6 @@ also the workload doesn't need to restart to pick up the certificate change when
     {{< text bash >}}
     $ cat install/kubernetes/namespace.yaml > istio-auth-sds.yaml
     $ cat install/kubernetes/helm/istio-init/files/crd-* >> istio-auth-sds.yaml
-    $ helm dep update --skip-refresh install/kubernetes/helm/istio
     $ helm template install/kubernetes/helm/istio --name istio --namespace istio-system --values install/kubernetes/helm/istio/values-istio-sds-auth.yaml >> istio-auth-sds.yaml
     $ kubectl create -f istio-auth-sds.yaml
     {{< /text >}}

@@ -20,7 +20,6 @@ requests to a testing Vault CA:
 
     {{< text bash >}}
     $ kubectl create clusterrolebinding cluster-admin-binding --clusterrole=cluster-admin --user="$(gcloud config get-value core/account)"
-    $ helm dep update --skip-refresh install/kubernetes/helm/istio
     $ cat install/kubernetes/namespace.yaml > istio-auth.yaml
     $ cat install/kubernetes/helm/istio-init/files/crd-* >> istio-auth.yaml
     $ helm template \

@@ -3,7 +3,7 @@ title: Can I use Prometheus to scrape application metrics with Istio?
 weight: 90
 ---
 
-Yes. Istio ships with [configuration for Prometheus]({{< github_file >}}/install/kubernetes/helm/subcharts/prometheus/templates/configmap.yaml)
+Yes. Istio ships with [configuration for Prometheus]({{< github_file >}}/install/kubernetes/helm/istio/charts/prometheus/templates/configmap.yaml)
 that enables collection of application metrics when mutual TLS is enabled or disabled.
 
 The `kubernetes-pods` job collects application metrics from pods in environments without mutual TLS. The `kubernetes-pods-istio-secure` job collects metrics

@@ -57,7 +57,7 @@ istio-system   tcpkubeattrgenrulerule   13d
 
 If the output shows no rules named `promhttp` or `promtcp`, then the Mixer configuration for sending metric instances to the Prometheus adapter is missing. You must supply the configuration for rules connecting the Mixer metric instances to a Prometheus handler.
 
-For reference, please consult the [default rules for Prometheus]({{< github_file >}}/install/kubernetes/helm/subcharts/mixer/templates/config.yaml).
+For reference, please consult the [default rules for Prometheus]({{< github_file >}}/install/kubernetes/helm/istio/charts/mixer/templates/config.yaml).
 
 ## Verify the Prometheus handler configuration exists
 
@@ -71,7 +71,7 @@ For reference, please consult the [default rules for Prometheus]({{< github_file
 
 1. If the output shows no configured Prometheus handlers, you must reconfigure Mixer with the appropriate handler configuration.
 
-    For reference, please consult the [default handler configuration for Prometheus]({{< github_file >}}/install/kubernetes/helm/subcharts/mixer/templates/config.yaml).
+    For reference, please consult the [default handler configuration for Prometheus]({{< github_file >}}/install/kubernetes/helm/istio/charts/mixer/templates/config.yaml).
 
 ## Verify Mixer metric instances configuration exists
 
@@ -90,7 +90,7 @@ For reference, please consult the [default rules for Prometheus]({{< github_file
 
 1. If the output shows no configured metric instances, you must reconfigure Mixer with the appropriate instance configuration.
 
-    For reference, please consult the [default instances configuration for metrics]({{< github_file >}}/install/kubernetes/helm/subcharts/mixer/templates/config.yaml).
+    For reference, please consult the [default instances configuration for metrics]({{< github_file >}}/install/kubernetes/helm/istio/charts/mixer/templates/config.yaml).
 
 ## Verify there are no known configuration errors
 

@@ -30,7 +30,7 @@
 # comments are needed in order to decode the commented helm
 # values.yaml file
 #
-YAML_CONFIG_DIR = "istio/install/kubernetes/helm/subcharts"
+YAML_CONFIG_DIR = "istio/install/kubernetes/helm/istio/charts"
 ISTIO_CONFIG_DIR = "istio/install/kubernetes/helm/istio"
 VALUES_YAML = "values.yaml"
 ISTIO_IO_DIR = os.path.abspath(__file__ + "/../../")
@@ -72,7 +72,7 @@ def endOfTheList(context, lineNum, lastLineNum, totalNum):
 def decode_helm_yaml(s):
     ret_val = ''
     #
-    # Iterate through all the directories under /istio/install/kubernetes/heml/subcharts 
+    # Iterate through all the directories under /istio/install/kubernetes/heml/istio/charts 
     # and process the configuration options from the respective values.yaml. The
     # configuration option name is the name of the directory that contains values.yaml.
     # This name will be passed in to the the function process_helm_yaml