Kubernetes Submit Queue 0b6bd601ae Merge pull request #50853 from dcbw/cni-conf ...

Automatic merge from submit-queue (batch tested with PRs 50531, 50853, 49976, 50939, 50607)

cni: print better error when a CNI .configlist is put into a .config

If the admin mistakenly puts a CNI configlist into a "conf" file, that's not correct, but kubelet will still read the config file and then fail to start the pod because "type=".  Be a bit smarter about that.  Should also be fixed in CNI, which I'm doing a PR for as well.

@squeed @thockin @freehan

2017-08-21 15:46:17 -07:00

..

api

Merge pull request #50146 from gmarek/deepcopyinto

2017-08-19 11:28:15 -07:00

apimachinery/tests

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

apis

Merge pull request #50678 from xiangpengzhao/remove-cm-flag

2017-08-21 08:26:20 -07:00

auth

Add enj as reviewer to OWNERS

2017-08-17 20:42:46 -04:00

bootstrap/api

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

capabilities

Merge pull request #49853 from duan-yue/capabilities

2017-08-12 02:35:57 -07:00

client

Update generated files

2017-08-15 11:56:46 +02:00

cloudprovider

Merge pull request #50860 from wlan0/master

2017-08-18 10:24:20 -07:00

controller

Merge pull request #50146 from gmarek/deepcopyinto

2017-08-19 11:28:15 -07:00

credentialprovider

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

features

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

fieldpath

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

generated

Fixup after k8s.io/{kube-gen -> code-generator} rename

2017-08-17 17:55:12 +02:00

hyperkube

Remove kubectl's dependence on schema file in pkg/api/validation.

2017-08-16 16:38:28 -07:00

kubeapiserver

make admission plugins handle mutating spec of uninitialized pods

2017-08-17 12:51:09 -07:00

kubectl

Merge pull request #50620 from juanvallejo/jvallejo/update-kubectl-top-validation

2017-08-21 08:26:23 -07:00

kubelet

Merge pull request #50853 from dcbw/cni-conf

2017-08-21 15:46:17 -07:00

kubemark

Make removing nodes public for Kubemark controller

2017-08-16 15:51:20 +02:00

master

Add enj as reviewer to OWNERS

2017-08-17 20:42:46 -04:00

printers

Port internal extensions/Network* to networking.k8s.io API group

2017-08-15 11:56:46 +02:00

probe

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

proxy

move IsLocalIP() and ShouldSkipService() to pkg/proxy/util

2017-08-17 14:32:05 +08:00

quota

update testcase err msg

2017-08-17 15:42:05 +08:00

registry

Add enj as reviewer to OWNERS

2017-08-17 20:42:46 -04:00

routes

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

security

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

securitycontext

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

serviceaccount

Merge pull request #50876 from enj/enj/f/owners_reviewer

2017-08-18 05:42:07 -07:00

ssh

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

util

Merge pull request #47506 from zhangxiaoyu-zidif/replace-sliceequal-by-deepequal

2017-08-21 14:30:00 -07:00

version

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

volume

Merge pull request #50693 from allencloud/fix-typos-in-quobyte

2017-08-21 14:29:55 -07:00

watch

Remove BUILD reference to removed files

2017-08-16 11:22:37 -07:00

BUILD

Remove BUILD reference to removed files

2017-08-16 11:22:37 -07:00

OWNERS

…