Merge remote-tracking branch 'upstream/main' into dev-1.24

2022-03-28 08:48:23 -07:00
parent 6da9c34b2e df12f23ec4
commit 7c67921f3f
189 changed files with 7876 additions and 5343 deletions
@@ -148,7 +148,28 @@ File references on the command line are relative to the current working director
 In `$HOME/.kube/config`, relative paths are stored relatively, and absolute paths
 are stored absolutely.

+## Proxy

+You can configure `kubectl` to use proxy by setting `proxy-url` in the kubeconfig file, like:
+
+```yaml
+apiVersion: v1
+kind: Config
+
+proxy-url: https://proxy.host:3128
+
+clusters:
+- cluster:
+  name: development
+
+users:
+- name: developer
+
+contexts:
+- context:
+  name: development
+
+```


 ## {{% heading "whatsnext" %}}