From f5a8ab47b499966483ef8157c15fadc97d9ecbb3 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Thu, 20 Aug 2020 16:41:11 -0400 Subject: [PATCH 1/3] Update tanka.md --- docs/sources/installation/tanka.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/sources/installation/tanka.md b/docs/sources/installation/tanka.md index b633881c9d746..884514cdce4e0 100644 --- a/docs/sources/installation/tanka.md +++ b/docs/sources/installation/tanka.md @@ -35,6 +35,19 @@ jb install github.com/grafana/loki/production/ksonnet/loki jb install github.com/grafana/loki/production/ksonnet/promtail ``` +Note: As of 2020-08-13 we use some as of yet non GA features. This step will likely not be necessary in future tanka releases. Simply install this library which we'll use as an override: + +```bash +jb install github.com/jsonnet-libs/k8s-alpha/1.14 +``` + +Next, override the `lib/k.libsonnet` with the following + +```jsonnet +(import 'github.com/jsonnet-libs/k8s-alpha/1.14/main.libsonnet') ++ (import 'github.com/jsonnet-libs/k8s-alpha/1.14/extensions/kausal-shim.libsonnet') +``` + Be sure to replace the username, password and the relevant `htpasswd` contents. Making sure to set the value for username, password, and `htpasswd` properly, replace the contents of `environments/loki/main.jsonnet` with: From 2e8031eb69915d81448322d4ec6f54a8fcda1461 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Thu, 20 Aug 2020 16:54:50 -0400 Subject: [PATCH 2/3] Update docs/sources/installation/tanka.md Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> --- docs/sources/installation/tanka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/tanka.md b/docs/sources/installation/tanka.md index 884514cdce4e0..1c3e8b338aae3 100644 --- a/docs/sources/installation/tanka.md +++ b/docs/sources/installation/tanka.md @@ -35,7 +35,7 @@ jb install github.com/grafana/loki/production/ksonnet/loki jb install github.com/grafana/loki/production/ksonnet/promtail ``` -Note: As of 2020-08-13 we use some as of yet non GA features. This step will likely not be necessary in future tanka releases. Simply install this library which we'll use as an override: +> **Note:** As of 2020-08-13, we use some features that are not yet generally available. This step will be unnecessary in future Tanka releases. For now, install this library, which we'll use as an override: ```bash jb install github.com/jsonnet-libs/k8s-alpha/1.14 From 9c9d52d9b25e5576f22c60f163b60e09c2ec306e Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Thu, 20 Aug 2020 16:54:58 -0400 Subject: [PATCH 3/3] Update docs/sources/installation/tanka.md Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> --- docs/sources/installation/tanka.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/tanka.md b/docs/sources/installation/tanka.md index 1c3e8b338aae3..a673ad8480c45 100644 --- a/docs/sources/installation/tanka.md +++ b/docs/sources/installation/tanka.md @@ -48,7 +48,7 @@ Next, override the `lib/k.libsonnet` with the following + (import 'github.com/jsonnet-libs/k8s-alpha/1.14/extensions/kausal-shim.libsonnet') ``` -Be sure to replace the username, password and the relevant `htpasswd` contents. +Be sure to replace the username, password, and the relevant `htpasswd` contents. Making sure to set the value for username, password, and `htpasswd` properly, replace the contents of `environments/loki/main.jsonnet` with: