From 99f18701151d59dafc5d9fb678706a75190b3175 Mon Sep 17 00:00:00 2001 From: Arthur Le Maitre Date: Wed, 30 Aug 2017 14:56:08 -0700 Subject: [PATCH 1/3] update first instructions for k8s with helm --- Documentation/running-clair.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/running-clair.md b/Documentation/running-clair.md index 54baa031..b3c33188 100644 --- a/Documentation/running-clair.md +++ b/Documentation/running-clair.md @@ -44,14 +44,15 @@ A [PostgreSQL 9.4+] database instance is required for all instructions. #### Kubernetes If you don't have a local Kubernetes cluster already, check out [minikube]. +This also requires [helm]. [minikube]: https://github.com/kubernetes/minikube +[helm]: https://github.com/kubernetes/helm ``` git clone https://github.com/coreos/clair -cd clair/contrib/k8s -kubectl create secret generic clairsecret --from-file=./config.yaml -kubectl create -f clair-kubernetes.yaml +cd clair/contrib/helm +helm install clair ``` ### Local From ccf263789c993b17736924088acb735968018c85 Mon Sep 17 00:00:00 2001 From: Arthur Le Maitre Date: Thu, 31 Aug 2017 10:25:52 -0700 Subject: [PATCH 2/3] update documentation for kubernetes / helm install --- Documentation/running-clair.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/running-clair.md b/Documentation/running-clair.md index b3c33188..dcccb7f1 100644 --- a/Documentation/running-clair.md +++ b/Documentation/running-clair.md @@ -41,18 +41,19 @@ A [PostgreSQL 9.4+] database instance is required for all instructions. ### Cluster -#### Kubernetes +#### Kubernetes (Helm) If you don't have a local Kubernetes cluster already, check out [minikube]. -This also requires [helm]. +This assumes you've already ran helm init and you have access to a currently running instance of Tiller. [minikube]: https://github.com/kubernetes/minikube -[helm]: https://github.com/kubernetes/helm ``` git clone https://github.com/coreos/clair cd clair/contrib/helm -helm install clair +cp values.yaml ~/my_custom_values.yaml +vi ~/my_custom_values.yaml +helm install clair -f ~/my_custom_values.yaml ``` ### Local From 6bd3458ae766566ea1f56c9b37d7065862f0ff5e Mon Sep 17 00:00:00 2001 From: Arthur Le Maitre Date: Thu, 31 Aug 2017 13:16:23 -0700 Subject: [PATCH 3/3] backtick helm init for prettier rendering --- Documentation/running-clair.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/running-clair.md b/Documentation/running-clair.md index dcccb7f1..7991cf7e 100644 --- a/Documentation/running-clair.md +++ b/Documentation/running-clair.md @@ -44,7 +44,7 @@ A [PostgreSQL 9.4+] database instance is required for all instructions. #### Kubernetes (Helm) If you don't have a local Kubernetes cluster already, check out [minikube]. -This assumes you've already ran helm init and you have access to a currently running instance of Tiller. +This assumes you've already ran `helm init` and you have access to a currently running instance of Tiller. [minikube]: https://github.com/kubernetes/minikube