github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-04 10:27:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #171 from dougbtv/flannel_fix

Browse Source 
Update flannel daemonset
This commit is contained in:
Doug Smith
2018-10-25 14:36:59 -04:00
committed by GitHub
parent ad50ff56ff 447c6e0c2d
commit bdf901c122
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
images/flannel-daemonset.yml
View File

@@ -101,8 +101,7 @@ spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: amd64 beta.kubernetes.io/arch: amd64
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule effect: NoSchedule
serviceAccountName: flannel serviceAccountName: flannel
# ------------------------------- Intentionally removed, Multus daemonset configures /etc/cni/net.d # ------------------------------- Intentionally removed, Multus daemonset configures /etc/cni/net.d
@@ -181,8 +180,7 @@ spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: arm64 beta.kubernetes.io/arch: arm64
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule effect: NoSchedule
serviceAccountName: flannel serviceAccountName: flannel
initContainers: initContainers:
@@ -260,8 +258,7 @@ spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: arm beta.kubernetes.io/arch: arm
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule effect: NoSchedule
serviceAccountName: flannel serviceAccountName: flannel
initContainers: initContainers:
@@ -339,8 +336,7 @@ spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: ppc64le beta.kubernetes.io/arch: ppc64le
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule effect: NoSchedule
serviceAccountName: flannel serviceAccountName: flannel
initContainers: initContainers:
@@ -418,8 +414,7 @@ spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: s390x beta.kubernetes.io/arch: s390x
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule effect: NoSchedule
serviceAccountName: flannel serviceAccountName: flannel
initContainers: initContainers:
@@ -476,4 +471,4 @@ spec:
path: /etc/cni/net.d path: /etc/cni/net.d
- name: flannel-cfg - name: flannel-cfg
configMap: configMap:
name: kube-flannel-cfg name: kube-flannel-cfg

3
images/multus-daemonset.yml
View File

@@ -111,8 +111,7 @@ spec:
nodeSelector: nodeSelector:
beta.kubernetes.io/arch: amd64 beta.kubernetes.io/arch: amd64
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule effect: NoSchedule
serviceAccountName: multus serviceAccountName: multus
containers: containers: