From f00ec1b04476a7ba7184224684ccabd493f99e0a Mon Sep 17 00:00:00 2001 From: Qiming Date: Tue, 3 Jul 2018 08:36:19 +0800 Subject: [PATCH] Fix links to relocated kubelet TLS bootstrapping topic (#9332) Fixes: #9330 --- .../docs/concepts/architecture/master-node-communication.md | 4 ++-- .../cluster-administration-overview.md | 2 +- content/en/docs/reference/access-authn-authz/rbac.md | 3 ++- .../reference/setup-tools/kubeadm/implementation-details.md | 5 +++-- .../en/docs/reference/setup-tools/kubeadm/kubeadm-init.md | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/content/en/docs/concepts/architecture/master-node-communication.md b/content/en/docs/concepts/architecture/master-node-communication.md index 4f73d41287..cdec599b1f 100644 --- a/content/en/docs/concepts/architecture/master-node-communication.md +++ b/content/en/docs/concepts/architecture/master-node-communication.md @@ -38,8 +38,8 @@ Nodes should be provisioned with the public root certificate for the cluster such that they can connect securely to the apiserver along with valid client credentials. For example, on a default GCE deployment, the client credentials provided to the kubelet are in the form of a client certificate. See -[kubelet TLS bootstrapping](/docs/admin/kubelet-tls-bootstrapping/) for -automated provisioning of kubelet client certificates. +[kubelet TLS bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) +for automated provisioning of kubelet client certificates. Pods that wish to connect to the apiserver can do so securely by leveraging a service account so that Kubernetes will automatically inject the public root diff --git a/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md b/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md index 5c83f861da..348caf2a7f 100644 --- a/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md +++ b/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md @@ -62,7 +62,7 @@ If you are using a guide involving Salt, see [Configuring Kubernetes with Salt]( ### Securing the kubelet * [Master-Node communication](/docs/concepts/architecture/master-node-communication/) - * [TLS bootstrapping](/docs/admin/kubelet-tls-bootstrapping/) + * [TLS bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) * [Kubelet authentication/authorization](/docs/admin/kubelet-authentication-authorization/) ## Optional Cluster Services diff --git a/content/en/docs/reference/access-authn-authz/rbac.md b/content/en/docs/reference/access-authn-authz/rbac.md index 0da410aeb5..70f8a77506 100644 --- a/content/en/docs/reference/access-authn-authz/rbac.md +++ b/content/en/docs/reference/access-authn-authz/rbac.md @@ -607,7 +607,8 @@ This is commonly used by add-on API servers for unified authentication and autho system:node-bootstrapper None -Allows access to the resources required to perform Kubelet TLS bootstrapping. +Allows access to the resources required to perform +Kubelet TLS bootstrapping. system:node-problem-detector diff --git a/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md b/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md index 9059248ce0..35de6b056b 100644 --- a/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md +++ b/content/en/docs/reference/setup-tools/kubeadm/implementation-details.md @@ -234,7 +234,8 @@ The static Pod manifest for the API server is affected by following parameters p Other API server flags that are set unconditionally are: - `--insecure-port=0` to avoid insecure connections to the api server - - `--enable-bootstrap-token-auth=true` to enable the `BootstrapTokenAuthenticator` authentication module. see [TLS Bootstrapping](/docs/admin/kubelet-tls-bootstrapping.md) for more details + - `--enable-bootstrap-token-auth=true` to enable the `BootstrapTokenAuthenticator` authentication module. + See [TLS Bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) for more details - `--allow-privileged` to `true` (required e.g. by kube proxy) - `--requestheader-client-ca-file` to `front-proxy-ca.crt` - `--enable-admission-plugins` to: @@ -282,7 +283,7 @@ The static Pod manifest for the API server is affected by following parameters p Other flags that are set unconditionally are: - `--controllers` enabling all the default controllers plus `BootstrapSigner` and `TokenCleaner` controllers for TLS bootstrap. - see [TLS Bootstrapping](/docs/admin/kubelet-tls-bootstrapping.md) for more details + See [TLS Bootstrapping](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) for more details - `--use-service-account-credentials` to `true` - Flags for using certificates generated in previous steps: - `--root-ca-file` to `ca.crt` diff --git a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md index c7ba6f2c67..0bfef92408 100644 --- a/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md +++ b/content/en/docs/reference/setup-tools/kubeadm/kubeadm-init.md @@ -68,7 +68,7 @@ following steps: 1. Makes all the necessary configurations for allowing node joining with the [Bootstrap Tokens](/docs/admin/bootstrap-tokens/) and - [TLS Bootstrap](/docs/admin/kubelet-tls-bootstrapping/) + [TLS Bootstrap](/docs/reference/command-line-tools-reference/kubelet-tls-bootstrapping/) mechanism: - Write a ConfigMap for making available all the information required