kubernetes

mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-01 22:34:14 +00:00

Files

Kubernetes Submit Queue 63d4af44ac Merge pull request #48004 from dnardo/gke

Automatic merge from submit-queue (batch tested with PRs 48004, 48205, 48130, 48207)

Do not set CNI in cases where there is a private master and network policy provider is set.

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

**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**:

**Release note**:

```release-note
In GCE and in a "private master" setup, do not set the network-plugin provider to CNI by default if a network policy provider is given.
```

2017-06-28 10:35:10 -07:00

container-linux

Merge pull request #47632 from mwielgus/node-taints-scripts

2017-06-20 18:18:59 -07:00

debian

remove support for debian masters in GCE

2017-02-28 09:54:07 -08:00

gci

Merge pull request #48004 from dnardo/gke

2017-06-28 10:35:10 -07:00

BUILD

Use cos-stable-59-9460-64-0 instead of cos-beta-59-9460-20-0.