github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46327 from supereagle/mark-network-plugin-dir-deprecated

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46327, 47166)

mark --network-plugin-dir deprecated for kubelet

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

**Which issue this PR fixes** : fixes #43967

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-19 11:23:55 -07:00
committed by GitHub
parent 012ffed6d3 dc9f0f9729
commit cc645a8c6f
7 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/make-rules/test-e2e-node.sh
View File

@@ -148,7 +148,7 @@ else
# Do not use any network plugin by default. User could override the flags with
# test_args.
test_args='--kubelet-flags="--network-plugin= --network-plugin-dir=" '$test_args
test_args='--kubelet-flags="--network-plugin= --cni-bin-dir=" '$test_args
# Runtime flags
test_args='--kubelet-flags="--container-runtime='$runtime'" '$test_args