Code Review
/
ta
/
caas-danm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Configure `caas_oam` as flannel interface
[ta/caas-danm.git]
/
ansible
/
roles
/
flannel
/
templates
/
flannel-ds.yaml
diff --git
a/ansible/roles/flannel/templates/flannel-ds.yaml
b/ansible/roles/flannel/templates/flannel-ds.yaml
index
eb0c571
..
73881e6
100644
(file)
--- a/
ansible/roles/flannel/templates/flannel-ds.yaml
+++ b/
ansible/roles/flannel/templates/flannel-ds.yaml
@@
-1,3
+1,4
@@
+#jinja2: lstrip_blocks: True
{#
Copyright 2019 Nokia
{#
Copyright 2019 Nokia
@@
-14,7
+15,7
@@
See the License for the specific language governing permissions and
limitations under the License.
#}
---
limitations under the License.
#}
---
-apiVersion: apps/v1
beta2
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: flannel-ds
kind: DaemonSet
metadata:
name: flannel-ds
@@
-39,7
+40,7
@@
spec:
#securityContext:
# runAsUser: {{ caas.uid.flannel }}
tolerations:
#securityContext:
# runAsUser: {{ caas.uid.flannel }}
tolerations:
- - key: node
-role
.kubernetes.io/master
+ - key: node.kubernetes.io/master
operator: Exists
effect: NoSchedule
containers:
operator: Exists
effect: NoSchedule
containers:
@@
-50,7
+51,9
@@
spec:
args:
- --ip-masq
- --kube-subnet-mgr
args:
- --ip-masq
- --kube-subnet-mgr
- - --iface={{ networking.infra_internal.interface }}
+ {% for interface in flannel_interfaces | default([]) %}
+ - --iface={{ interface }}
+ {% endfor %}
securityContext:
privileged: true
env:
securityContext:
privileged: true
env: