diff options
| author | k8s-ci-robot <k8s-ci-robot@users.noreply.github.com> | 2018-10-12 01:08:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 01:08:51 -0700 |
| commit | d75e8344df88b02a2647ea6943de5e1355c2d07e (patch) | |
| tree | 47992545ca037717e17a7a43ce04ba7c0e9fd99d | |
| parent | 2677591244c65a14dda77e7ed0fb43c980de6d9a (diff) | |
| parent | f59dec84285320d496b20286f4451dc8b957255f (diff) | |
Merge pull request #2784 from SataQiu/fix-20181012
fix some typos
| -rw-r--r-- | communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md | 2 | ||||
| -rw-r--r-- | keps/sig-cluster-lifecycle/0015-kubeadm-join-control-plane.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md b/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md index d7b7c862..7118b6eb 100644 --- a/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md +++ b/communication/meeting-notes-archive/q1-2_2018_community_meeting_minutes.md @@ -1042,7 +1042,7 @@ **Help Wanted?** * [SIG UI](https://github.com/kubernetes/community/blob/master/sig-ui/README.md) is looking for additional contributors (with javascript and/or go knowledge) and maintainers - * [Piotr](https://github.com/bryk) and and [Konrad](https://github.com/konryd) from google have offered to bring folks up to speed. + * [Piotr](https://github.com/bryk) and [Konrad](https://github.com/konryd) from google have offered to bring folks up to speed. * Take a look at open issues to get started or reach out to their slack channel, mailing list, or next meeting. * SIG UI mailing list: [https://groups.google.com/forum/#!forum/kubernetes-sig-ui](https://groups.google.com/forum/#!forum/kubernetes-sig-ui) diff --git a/keps/sig-cluster-lifecycle/0015-kubeadm-join-control-plane.md b/keps/sig-cluster-lifecycle/0015-kubeadm-join-control-plane.md index 4be31d5b..b69c5783 100644 --- a/keps/sig-cluster-lifecycle/0015-kubeadm-join-control-plane.md +++ b/keps/sig-cluster-lifecycle/0015-kubeadm-join-control-plane.md @@ -232,7 +232,7 @@ should copy control plane certificates from an existing control plane instance, > in the machine where it is running, so it is not possible to copy automatically > certificates from remote locations. -Please note that strictly speaking only ca, front-proxy-ca certificate and and service account key pair +Please note that strictly speaking only ca, front-proxy-ca certificate and service account key pair are required to be equal among all control plane instances. Accordingly: - `kubeadm join --control-plane` will check for the mandatory certificates and fail fast if |