External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 09:38:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

Minor update to cni-plugins and kube-router

Browse Source
This commit is contained in:
Florian Ruynat
2021-04-18 04:00:46 +02:00
committed by Kubernetes Prow Robot
parent fce705a92b
commit b32d25942d
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
View File

@@ -9,9 +9,6 @@ spec:
served: true
storage: true
additionalPrinterColumns:
- name: Provider
type: string
jsonPath: .spec.provider
- name: IP
type: string
jsonPath: .spec.ipAddress

16
roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
View File

@@ -26,7 +26,6 @@ spec:
spec:
tolerations:
- operator: Exists
effect: NoSchedule
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@@ -47,7 +46,7 @@ spec:
- --default-cidr={{ kube_pods_subnet }}
env:
- name: ENABLE_SSL
value: "{{ enable_ssl }}"
value: "{{ enable_ssl | lower }}"
- name: POD_NAME
valueFrom:
fieldRef:
@@ -138,15 +137,15 @@ spec:
- bash
- /kube-ovn/start-cniserver.sh
args:
- --enable-mirror={{ traffic_mirror }}
- --encap-checksum={{ encap_checksum }}
- --enable-mirror={{ traffic_mirror | lower }}
- --encap-checksum={{ encap_checksum | lower }}
- --service-cluster-ip-range={{ kube_service_addresses }}
securityContext:
runAsUser: 0
privileged: true
env:
- name: ENABLE_SSL
value: "{{ enable_ssl }}"
value: "{{ enable_ssl | lower }}"
- name: POD_IP
valueFrom:
fieldRef:
@@ -156,6 +155,8 @@ spec:
fieldRef:
fieldPath: spec.nodeName
volumeMounts:
- mountPath: /etc/openvswitch
name: systemid
- mountPath: /etc/cni/net.d
name: cni-conf
- mountPath: /run/openvswitch
@@ -188,6 +189,9 @@ spec:
nodeSelector:
kubernetes.io/os: "linux"
volumes:
- name: systemid
hostPath:
path: /etc/origin/openvswitch
- name: host-run-ovs
hostPath:
path: /run/openvswitch
@@ -240,7 +244,7 @@ spec:
privileged: false
env:
- name: ENABLE_SSL
value: "{{ enable_ssl }}"
value: "{{ enable_ssl | lower }}"
- name: POD_IP
valueFrom:
fieldRef:

8
roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
View File

@@ -215,7 +215,6 @@ spec:
spec:
tolerations:
- operator: Exists
effect: NoSchedule
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@@ -237,7 +236,7 @@ spec:
add: ["SYS_NICE"]
env:
- name: ENABLE_SSL
value: "{{ enable_ssl }}"
value: "{{ enable_ssl | lower }}"
- name: POD_IP
valueFrom:
fieldRef:
@@ -297,7 +296,7 @@ spec:
command: ["/kube-ovn/start-ovn-monitor.sh"]
env:
- name: ENABLE_SSL
value: "{{ enable_ssl }}"
value: "{{ enable_ssl | lower }}"
- name: POD_IP
valueFrom:
fieldRef:
@@ -401,7 +400,6 @@ spec:
spec:
tolerations:
- operator: Exists
effect: NoSchedule
priorityClassName: system-cluster-critical
serviceAccountName: ovn
hostNetwork: true
@@ -416,7 +414,7 @@ spec:
privileged: true
env:
- name: ENABLE_SSL
value: "{{ enable_ssl }}"
value: "{{ enable_ssl | lower }}"
- name: POD_IP
valueFrom:
fieldRef: