Skip to content

Commit d6f5fc6

Browse files
authored
Return back --network-plugin=cni (#883)
Signed-off-by: Artiom Diomin <[email protected]>
1 parent 0181def commit d6f5fc6

File tree

78 files changed

+78
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+78
-4
lines changed

pkg/userdata/centos/testdata/kubelet-v1.17-aws-external.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ write_files:
198198
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
199199
--kubeconfig=/var/lib/kubelet/kubeconfig \
200200
--config=/etc/kubernetes/kubelet.conf \
201+
--network-plugin=cni \
201202
--cert-dir=/etc/kubernetes/pki \
202203
--cloud-provider=external \
203204
--dynamic-config-dir=/etc/kubernetes/dynamic-config-dir \

pkg/userdata/centos/testdata/kubelet-v1.17-aws.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ write_files:
198198
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
199199
--kubeconfig=/var/lib/kubelet/kubeconfig \
200200
--config=/etc/kubernetes/kubelet.conf \
201+
--network-plugin=cni \
201202
--cert-dir=/etc/kubernetes/pki \
202203
--cloud-provider=aws \
203204
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-mirrors.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ write_files:
213213
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
214214
--kubeconfig=/var/lib/kubelet/kubeconfig \
215215
--config=/etc/kubernetes/kubelet.conf \
216+
--network-plugin=cni \
216217
--cert-dir=/etc/kubernetes/pki \
217218
--cloud-provider=vsphere \
218219
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/centos/testdata/kubelet-v1.17-vsphere-proxy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ write_files:
213213
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
214214
--kubeconfig=/var/lib/kubelet/kubeconfig \
215215
--config=/etc/kubernetes/kubelet.conf \
216+
--network-plugin=cni \
216217
--cert-dir=/etc/kubernetes/pki \
217218
--cloud-provider=vsphere \
218219
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/centos/testdata/kubelet-v1.17-vsphere.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ write_files:
205205
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
206206
--kubeconfig=/var/lib/kubelet/kubeconfig \
207207
--config=/etc/kubernetes/kubelet.conf \
208+
--network-plugin=cni \
208209
--cert-dir=/etc/kubernetes/pki \
209210
--cloud-provider=vsphere \
210211
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/centos/testdata/kubelet-v1.18-aws.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ write_files:
198198
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
199199
--kubeconfig=/var/lib/kubelet/kubeconfig \
200200
--config=/etc/kubernetes/kubelet.conf \
201+
--network-plugin=cni \
201202
--cert-dir=/etc/kubernetes/pki \
202203
--cloud-provider=aws \
203204
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/centos/testdata/kubelet-v1.19-aws.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ write_files:
198198
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
199199
--kubeconfig=/var/lib/kubelet/kubeconfig \
200200
--config=/etc/kubernetes/kubelet.conf \
201+
--network-plugin=cni \
201202
--cert-dir=/etc/kubernetes/pki \
202203
--cloud-provider=aws \
203204
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/centos/testdata/kubelet-v1.20-aws.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ write_files:
198198
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
199199
--kubeconfig=/var/lib/kubelet/kubeconfig \
200200
--config=/etc/kubernetes/kubelet.conf \
201+
--network-plugin=cni \
201202
--cert-dir=/etc/kubernetes/pki \
202203
--cloud-provider=aws \
203204
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/coreos/testdata/v1.17.16-vsphere.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ systemd:
141141
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
142142
--kubeconfig=/var/lib/kubelet/kubeconfig \
143143
--config=/etc/kubernetes/kubelet.conf \
144+
--network-plugin=cni \
144145
--cert-dir=/etc/kubernetes/pki \
145146
--cloud-provider=vsphere \
146147
--cloud-config=/etc/kubernetes/cloud-config \

pkg/userdata/coreos/testdata/v1.18.14-aws-disable-auto-update-external.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ systemd:
125125
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
126126
--kubeconfig=/var/lib/kubelet/kubeconfig \
127127
--config=/etc/kubernetes/kubelet.conf \
128+
--network-plugin=cni \
128129
--cert-dir=/etc/kubernetes/pki \
129130
--cloud-provider=external \
130131
--dynamic-config-dir=/etc/kubernetes/dynamic-config-dir \

0 commit comments

Comments
 (0)