From 9749689c4843807324b11f6b56afd35d878e30a3 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Tue, 3 Mar 2020 19:26:13 +0100 Subject: [PATCH] doc: Tidy up usage of Helm Fixes #10436 Signed-off-by: Ilya Dmitrichenko --- Documentation/gettingstarted/hubble-install.rst | 14 +++----------- .../k8s-install-download-release.rst | 7 +++---- Documentation/gettingstarted/k8s-install-eks.rst | 4 ++-- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Documentation/gettingstarted/hubble-install.rst b/Documentation/gettingstarted/hubble-install.rst index 4407d1bb3aca..dcd4c510884d 100644 --- a/Documentation/gettingstarted/hubble-install.rst +++ b/Documentation/gettingstarted/hubble-install.rst @@ -6,22 +6,14 @@ for cloud native workloads. It is built on top of Cilium and eBPF to enable deep visibility into the communication and behavior of services as well as the networking infrastructure in a completely transparent manner. `Visit Hubble Github page `_. -Generate the deployment files using Helm and deploy it: +Deploy Hubble using Helm: .. code:: bash git clone https://github.com/cilium/hubble.git cd hubble/install/kubernetes - helm template hubble \ + helm install hubble ./hubble \ --namespace kube-system \ --set metrics.enabled="{dns,drop,tcp,flow,port-distribution,icmp,http}" \ - --set ui.enabled=true \ - > hubble.yaml - - -Deploy Hubble: - -.. code:: bash - - kubectl apply -f hubble.yaml \ No newline at end of file + --set ui.enabled=true diff --git a/Documentation/gettingstarted/k8s-install-download-release.rst b/Documentation/gettingstarted/k8s-install-download-release.rst index d18b1201d449..07c8e4a42222 100644 --- a/Documentation/gettingstarted/k8s-install-download-release.rst +++ b/Documentation/gettingstarted/k8s-install-download-release.rst @@ -1,11 +1,10 @@ -`Install Helm`_ version 3.0.0 or higher to prepare generating the deployment -artifacts based on the Helm templates. +First, make sure you have `installed Helm`_ version 3.0.0 or higher. -.. _Install Helm: https://helm.sh/docs/using_helm/#install-helm +.. _installed Helm: https://helm.sh/docs/using_helm/#install-helm .. only:: stable - Setup helm repository: + Setup Helm repository: .. code:: bash diff --git a/Documentation/gettingstarted/k8s-install-eks.rst b/Documentation/gettingstarted/k8s-install-eks.rst index d833f58be311..b954df5519ff 100644 --- a/Documentation/gettingstarted/k8s-install-eks.rst +++ b/Documentation/gettingstarted/k8s-install-eks.rst @@ -79,8 +79,8 @@ does not interfere with the ENIs managed by Cilium: kubectl -n kube-system set image daemonset/aws-node aws-node=docker.io/spaster/alpine-sleep -Prepare & Deploy Cilium -======================= +Deploy Cilium +============= .. include:: k8s-install-download-release.rst