更新其他安装脚本支持kube-ovn网络

pull/626/head
gjmzj 2019-05-22 14:31:29 +08:00
parent 828de9d3b5
commit bc9d2c18a5
4 changed files with 10 additions and 1 deletions

View File

@ -12,3 +12,4 @@
- { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" } - { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" }
- { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" } - { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" }
- { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" } - { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" }
- { role: kube-ovn, when: "CLUSTER_NETWORK == 'kube-ovn'" }

View File

@ -13,6 +13,7 @@
- { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" } - { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" }
- { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" } - { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" }
- { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" } - { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" }
- { role: kube-ovn, when: "CLUSTER_NETWORK == 'kube-ovn'" }
# #
tasks: tasks:
- name: Making master nodes SchedulingDisabled - name: Making master nodes SchedulingDisabled

View File

@ -40,3 +40,4 @@
- { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" } - { role: cilium, when: "CLUSTER_NETWORK == 'cilium'" }
- { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" } - { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" }
- { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" } - { role: kube-router, when: "CLUSTER_NETWORK == 'kube-router'" }
- { role: kube-ovn, when: "CLUSTER_NETWORK == 'kube-ovn'" }

View File

@ -144,6 +144,10 @@
- "/var/lib/cni/" - "/var/lib/cni/"
- "/var/lib/kube-router/" - "/var/lib/kube-router/"
- "/opt/kube/kube-system/" - "/opt/kube/kube-system/"
- "/var/run/openvswitch/"
- "/etc/origin/openvswitch/"
- "/etc/openvswitch/"
- "/var/log/openvswitch/"
- name: cleanup iptables - name: cleanup iptables
shell: "iptables -F && iptables -X \ shell: "iptables -F && iptables -X \
@ -160,7 +164,9 @@
ip link del dummy0; \ ip link del dummy0; \
ip link del kube-ipvs0; \ ip link del kube-ipvs0; \
ip link del cilium_net; \ ip link del cilium_net; \
ip link del cilium_vxlan" ip link del cilium_vxlan; \
ip link del ovn0; \
ip link del ovs-system"
ignore_errors: true ignore_errors: true
- name: cleanup networks2 - name: cleanup networks2