From 6893daac2617b72f9c037e85b7b4d71f48878c70 Mon Sep 17 00:00:00 2001 From: Chris Burgess Date: Wed, 13 Apr 2022 21:05:08 +1200 Subject: [PATCH 1/2] Docs fix for kubectl proxy configuration Follow-up to https://github.com/kubernetes/website/pull/32245 --- .../configuration/organize-cluster-access-kubeconfig.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md b/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md index 713592cf989ec..b2b3870e86bc6 100644 --- a/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md +++ b/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md @@ -150,16 +150,16 @@ are stored absolutely. ## Proxy -You can configure `kubectl` to use proxy by setting `proxy-url` in the kubeconfig file, like: +You can configure `kubectl` to use a proxy per cluster using `proxy-url` in your kubeconfig file, like this: ```yaml apiVersion: v1 kind: Config -proxy-url: https://proxy.host:3128 - clusters: - cluster: + proxy-url: http://proxy.example.org:3128 + server: https://k8s.example.org/k8s/clusters/c-xxyyzz name: development users: @@ -167,8 +167,7 @@ users: contexts: - context: - name: development - + name: development ``` From 81fe9b4e917a8f33ae1a0aa03c1630cfc1f60d01 Mon Sep 17 00:00:00 2001 From: Chris Burgess Date: Wed, 13 Apr 2022 21:05:08 +1200 Subject: [PATCH 2/2] Docs fix for kubectl proxy configuration Follow-up to https://github.com/kubernetes/website/pull/32245 --- .../configuration/organize-cluster-access-kubeconfig.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md b/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md index b2b3870e86bc6..87c4737ad765f 100644 --- a/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md +++ b/content/en/docs/concepts/configuration/organize-cluster-access-kubeconfig.md @@ -18,7 +18,7 @@ It does not mean that there is a file named `kubeconfig`. {{< /note >}} {{< warning >}} -Only use kubeconfig files from trusted sources. Using a specially-crafted kubeconfig file could result in malicious code execution or file exposure. +Only use kubeconfig files from trusted sources. Using a specially-crafted kubeconfig file could result in malicious code execution or file exposure. If you must use an untrusted kubeconfig file, inspect it carefully first, much as you would a shell script. {{< /warning>}} @@ -53,7 +53,7 @@ clusters and namespaces. A *context* element in a kubeconfig file is used to group access parameters under a convenient name. Each context has three parameters: cluster, namespace, and user. By default, the `kubectl` command-line tool uses parameters from -the *current context* to communicate with the cluster. +the *current context* to communicate with the cluster. To choose the current context: ``` @@ -167,7 +167,7 @@ users: contexts: - context: - name: development + name: development ```