Production-Grade Container Scheduling and Management
Go to file
Kubernetes Submit Queue fd55cb25f1
Merge pull request #55479 from ijc/kubeadm-optional-master-taint
Automatic merge from submit-queue (batch tested with PRs 59767, 56454, 59237, 59730, 55479). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

kubeadm: add configuration option to not taint master

**What this PR does / why we need it**:

Although tainting the master is normally a good and proper thing to do in some situations (docker for mac in our case, but I suppose minikube and such as well) having a single host configuration is desirable.

In linuxkit we have a [workaround](443e47c408/projects/kubernetes/kubernetes/kubeadm-init.sh (L19...L22)) to remove the taint after initialisation. With the change here we could simply populate `/etc/kubeadm/kubeadm.yaml` with `noTaintMaster: true` instead and have it never be tainted in the first place.

I have only added this to the config file and not to the CLI since AIUI the latter is somewhat deprecated.

The code also arranges to _remove_ an existing taint if it is unwanted. I'm unsure if this behaviour is correct or desirable, I think a reasonable argument could be made for leaving an existing taint in place too.

Signed-off-by: Ian Campbell <ijc@docker.com>

**Release note**:

Since the requirement for this option is rather niche and not best practice in the majority of cases I'm not sure if it warrants mentioning in the release notes? If it were then perhaps

```release-note
`kubeadm init` can now omit the tainting of the master node if configured to do so in `kubeadm.yaml`.
```
2018-02-12 15:44:41 -08:00
.github Merge pull request #54114 from xiangpengzhao/fix-pr-template 2017-10-30 18:37:06 -07:00
api auto-generated 2018-02-11 11:04:15 +08:00
build fix all the typos across the project 2018-02-11 11:04:14 +08:00
cluster Merge pull request #59730 from hyperbolic2346/mwilson/auth-token-node-name 2018-02-12 15:44:38 -08:00
cmd Merge pull request #55479 from ijc/kubeadm-optional-master-taint 2018-02-12 15:44:41 -08:00
docs auto-generated 2018-02-11 11:04:15 +08:00
examples fix all the typos across the project 2018-02-11 11:04:14 +08:00
Godeps Update cadvisor to 6116f265302357cbb10f84737af30b1f13ce2d6c 2018-02-08 22:37:39 +00:00
hack Merge pull request #59506 from juanvallejo/jvallejo/handle-watch-multiple-reqs 2018-02-12 02:25:45 -08:00
logo
pkg Merge pull request #56454 from mtanino/volumehandler-refactor 2018-02-12 15:44:33 -08:00
plugin Merge pull request #59464 from dixudx/fix_all_typos 2018-02-10 22:12:45 -08:00
staging Merge pull request #59464 from dixudx/fix_all_typos 2018-02-10 22:12:45 -08:00
test Merge pull request #59464 from dixudx/fix_all_typos 2018-02-10 22:12:45 -08:00
third_party Add OWNERS for third_party folder 2018-02-04 21:47:07 -08:00
translations Add OWNERS for translations folder 2018-02-04 23:54:07 -08:00
vendor Update cadvisor to 6116f265302357cbb10f84737af30b1f13ce2d6c 2018-02-08 22:37:39 +00:00
.bazelrc
.generated_files
.gitattributes Hide generated files only on github 2018-01-22 10:58:48 +01:00
.gitignore fix all the typos across the project 2018-02-11 11:04:14 +08:00
.kazelcfg.json
BUILD.bazel
CHANGELOG-1.2.md
CHANGELOG-1.3.md fix the format for github error 2018-01-31 14:49:29 +08:00
CHANGELOG-1.4.md fix the format for github error 2018-02-02 18:44:27 +08:00
CHANGELOG-1.5.md fix typo in kubeadm 2018-02-06 13:48:18 +08:00
CHANGELOG-1.6.md Fix typo 2018-02-01 19:11:19 +08:00
CHANGELOG-1.7.md Update CHANGELOG-1.7.md for v1.7.12. 2017-12-29 13:42:49 +01:00
CHANGELOG-1.8.md Update CHANGELOG-1.8.md for v1.8.8. 2018-02-09 15:01:39 -08:00
CHANGELOG-1.9.md Merge pull request #59464 from dixudx/fix_all_typos 2018-02-10 22:12:45 -08:00
CHANGELOG-1.10.md fix all the typos across the project 2018-02-11 11:04:14 +08:00
CHANGELOG.md Update release note links for 1.10 2018-01-17 22:45:12 +01:00
code-of-conduct.md Update code-of-conduct.md 2017-12-20 13:33:36 -05:00
CONTRIBUTING.md Pointed to community/contributors/guide/README.md 2017-12-15 22:08:34 +05:30
labels.yaml
LICENSE
Makefile
Makefile.generated_files
OWNERS
OWNERS_ALIASES Add OWNERS for Godeps and vendor folders 2018-02-04 21:41:12 -08:00
README.md Update README.md with punctuation improvements 2018-01-23 10:16:37 -06:00
SUPPORT.md
WORKSPACE

Kubernetes

Submit Queue Widget GoDoc Widget CII Best Practices


Kubernetes is an open source system for managing containerized applications across multiple hosts; providing basic mechanisms for deployment, maintenance, and scaling of applications.

Kubernetes builds upon a decade and a half of experience at Google running production workloads at scale using a system called Borg, combined with best-of-breed ideas and practices from the community.

Kubernetes is hosted by the Cloud Native Computing Foundation (CNCF). If you are a company that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF. For details about who's involved and how Kubernetes plays a role, read the CNCF announcement.


To start using Kubernetes

See our documentation on kubernetes.io.

Try our interactive tutorial.

Take a free course on Scalable Microservices with Kubernetes.

To start developing Kubernetes

The community repository hosts all information about building Kubernetes from source, how to contribute code and documentation, who to contact about what, etc.

If you want to build Kubernetes right away there are two options:

You have a working Go environment.
$ go get -d k8s.io/kubernetes
$ cd $GOPATH/src/k8s.io/kubernetes
$ make
You have a working Docker environment.
$ git clone https://github.com/kubernetes/kubernetes
$ cd kubernetes
$ make quick-release

For the full story, head over to the developer's documentation.

Support

If you need support, start with the troubleshooting guide, and work your way through the process that we've outlined.

That said, if you have questions, reach out to us one way or another.

Analytics