From b32d25942dc907e94aa143e699dc144a0289efee Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Sun, 18 Apr 2021 04:00:46 +0200
Subject: [PATCH] Minor update to cni-plugins and kube-router
---
README.md | 2 +-
roles/download/defaults/main.yml | 10 +++++-----
.../kube-ovn/templates/cni-kube-ovn-crd.yml.j2 | 3 ---
.../kube-ovn/templates/cni-kube-ovn.yml.j2 | 16 ++++++++++------
.../kube-ovn/templates/cni-ovn.yml.j2 | 8 +++-----
5 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index 8291528ad..06f77bf61 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [cilium](https://github.com/cilium/cilium) v1.8.8
- [flanneld](https://github.com/coreos/flannel) v0.13.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.6.2
- - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.2.0
+ - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.2.2
- [multus](https://github.com/intel/multus-cni) v3.7.0
- [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
- [weave](https://github.com/weaveworks/weave) v2.8.1
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 1979eeb69..3ac125b0c 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -74,12 +74,12 @@ calico_typha_version: "{{ calico_version }}"
typha_enabled: false
flannel_version: "v0.13.0"
-cni_version: "v0.9.0"
+cni_version: "v0.9.1"
weave_version: 2.8.1
pod_infra_version: "3.3"
cilium_version: "v1.8.8"
kube_ovn_version: "v1.6.2"
-kube_router_version: "v1.2.0"
+kube_router_version: "v1.2.2"
multus_version: "v3.7"
ovn4nfv_ovn_image_version: "v1.0.0"
ovn4nfv_k8s_plugin_image_version: "v1.1.0"
@@ -313,9 +313,9 @@ etcd_binary_checksums:
arm64: 1934ebb9f9f6501f706111b78e5e321a7ff8d7792d3d96a76e2d01874e42a300
amd64: 2ac029e47bab752dacdb7b30032f230f49e2f457cbc32e8f555c2210bb5ff107
cni_binary_checksums:
- arm: 11e6f62c6e67cb17b98f91e30718a057c6caf88d02e8f6ab3f3e0e8f642e0e26
- arm64: 49bdf1d3c852a831964aea8c9d12340b36107ee756d8328403905ff599abc6f5
- amd64: 58a58d389895ba9f9bbd3ef330f186c0bb7484136d0bfb9b50152eed55d9ec24
+ arm: 909e800d01cc61ffa26f2629e4a202a58d727e6ccaabd0310ef18d2b1e00943c
+ arm64: ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0
+ amd64: 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7
calicoctl_binary_checksums:
arm:
v3.18.1: 0
diff --git a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2 b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
index 44d683de5..396ebc6ea 100644
--- a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
@@ -9,9 +9,6 @@ spec:
served: true
storage: true
additionalPrinterColumns:
- - name: Provider
- type: string
- jsonPath: .spec.provider
- name: IP
type: string
jsonPath: .spec.ipAddress
diff --git a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2 b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
index e71e96869..c0f9ee104 100644
--- a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn.yml.j2
@@ -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:
diff --git a/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2 b/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
index d2c41fe92..0d5b4a3ee 100644
--- a/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
@@ -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:
--
GitLab