kubernetes

mirror of https://github.com/outbackdingo/kubernetes.git synced 2026-02-19 01:10:35 +00:00

Files

Kubernetes Submit Queue 5a9759b0b4 Merge pull request #45376 from luxas/kubeadm_fix_taints

Automatic merge from submit-queue (batch tested with PRs 45309, 45376)

kubeadm: Fix the tainting of the master node

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

Currently, kubeadm unintentionally removes Taints set with the kubelet flag `--register-with-taints` when creating a new Taint slice instead of appening the existing one. This PR fixes that behavior.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

This should be a cherrypick candidate for v1.6 cc @enisoc 

**Release note**:

```release-note
kubeadm: Fix invalid assign statement so it is possible to register the master kubelet with other initial Taints
```
@jbeda @dmmcquay @mikedanese @krousey PTAL, very straightforward PR

2017-05-04 15:54:39 -07:00

clicheck

Enable auto-generating sources rules

2017-01-05 14:14:13 -08:00

cloud-controller-manager

bazel: statically link dockerized components

2017-04-14 15:51:54 -07:00

gendocs

autogenerated

2017-04-14 10:40:57 -07:00

genkubedocs

autogenerated