From 00e821d14a786e5ec875728211c2a2f0e87a383f Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Sat, 20 Jan 2018 09:08:02 +0800 Subject: [PATCH 1/2] Update certificates.md --- docs/admin/high-availability/index.md | 3 +-- docs/admin/salt.md | 4 ---- .../cluster-administration/certificates.md | 21 +------------------ ...aranteed-scheduling-critical-addon-pods.md | 7 +------ 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/docs/admin/high-availability/index.md b/docs/admin/high-availability/index.md index 8516613493..3a5d8b1d83 100644 --- a/docs/admin/high-availability/index.md +++ b/docs/admin/high-availability/index.md @@ -54,8 +54,7 @@ choices. For example, on systemd-based systems (e.g. RHEL, CentOS), you can run If you are extending from a standard Kubernetes installation, the `kubelet` binary should already be present on your system. You can run `which kubelet` to determine if the binary is in fact installed. If it is not installed, -you should install the [kubelet binary](https://storage.googleapis.com/kubernetes-release/release/v0.19.3/bin/linux/amd64/kubelet), the -[kubelet init file](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/salt/kubelet/initd) and [default-kubelet](/docs/admin/high-availability/default-kubelet) +you should install the [kubelet binary](https://storage.googleapis.com/kubernetes-release/release/v0.19.3/bin/linux/amd64/kubelet) and [default-kubelet](/docs/admin/high-availability/default-kubelet) scripts. If you are using monit, you should also install the monit daemon (`apt-get install monit`) and the [monit-kubelet](/docs/admin/high-availability/monit-kubelet) and diff --git a/docs/admin/salt.md b/docs/admin/salt.md index 318899132d..7470601350 100644 --- a/docs/admin/salt.md +++ b/docs/admin/salt.md @@ -99,7 +99,3 @@ When configuring default arguments for processes, it's best to avoid the use of Per pod IP configuration is provider-specific, so when making networking changes, it's important to sandbox these as all providers may not use the same mechanisms (iptables, openvswitch, etc.) We should define a grains.conf key that captures more specifically what network configuration environment is being used to avoid future confusion across providers. - -## Further reading - -The [cluster/saltbase](http://releases.k8s.io/{{page.githubbranch}}/cluster/saltbase/) tree has more details on the current SaltStack configuration. diff --git a/docs/concepts/cluster-administration/certificates.md b/docs/concepts/cluster-administration/certificates.md index 315d4e141e..1c218b674d 100644 --- a/docs/concepts/cluster-administration/certificates.md +++ b/docs/concepts/cluster-administration/certificates.md @@ -8,26 +8,7 @@ title: Certificates ## Creating Certificates When using client certificate authentication, you can generate certificates -using an existing deployment script or manually through `easyrsa`, `openssl` -or `cfssl`. - -### Using an Existing Deployment Script - -**Using an existing deployment script** is implemented at -`cluster/saltbase/salt/generate-cert/make-ca-cert.sh`. - -Execute this script with two parameters. The first is the IP address -of API server. The second is a list of subject alternate names in the form `IP: or DNS:`. - -The script generates three files: `ca.crt`, `server.crt`, and `server.key`. - -Finally, add the following parameters into API server start parameters: - -``` ---client-ca-file=/srv/kubernetes/ca.crt ---tls-cert-file=/srv/kubernetes/server.crt ---tls-private-key-file=/srv/kubernetes/server.key -``` +manually through `easyrsa`, `openssl` or `cfssl`. ### easyrsa diff --git a/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md b/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md index 25f4387e30..554a6f5be4 100644 --- a/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md +++ b/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md @@ -39,12 +39,7 @@ killed for this purpose. ## Config -Rescheduler should be [enabled by default as a static pod](https://git.k8s.io/kubernetes/cluster/saltbase/salt/rescheduler/rescheduler.manifest). -It doesn't have any user facing configuration (component config) or API and can be disabled: - -* during cluster setup by setting `ENABLE_RESCHEDULER` flag to `false` -* on running cluster by deleting its manifest from master node -(default path `/etc/kubernetes/manifests/rescheduler.manifest`) +Rescheduler should be enabled by default. It doesn't have any user facing configuration (component config) or API and can be disabled too. ### Marking add-on as critical From 39dce2aabd2bcfdcddaf9102ff447eff30ae1ec6 Mon Sep 17 00:00:00 2001 From: Joseph Heck Date: Sun, 21 Jan 2018 11:44:56 -0800 Subject: [PATCH 2/2] updating language --- .../guaranteed-scheduling-critical-addon-pods.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md b/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md index 554a6f5be4..85c387f0ab 100644 --- a/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md +++ b/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods.md @@ -39,7 +39,8 @@ killed for this purpose. ## Config -Rescheduler should be enabled by default. It doesn't have any user facing configuration (component config) or API and can be disabled too. +Rescheduler should be enabled by default. It doesn't have any user facing configuration (component config) or API. +Rescheduler may also be disabled. ### Marking add-on as critical