From b064274e278bdb411a28668acaf27fa7b41c082e Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Tue, 30 Jun 2020 17:54:06 +0200
Subject: [PATCH] Update kube-router to 1.0.0 (#6211)
---
README.md | 2 +-
roles/download/defaults/main.yml | 2 +-
.../kube-router/templates/kube-router.yml.j2 | 10 +++++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index e1c37cf5a..4fe0520d1 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [contiv](https://github.com/contiv/install) v1.2.1
- [flanneld](https://github.com/coreos/flannel) v0.12.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.1
- - [kube-router](https://github.com/cloudnativelabs/kube-router) v0.4.0
+ - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.0
- [multus](https://github.com/intel/multus-cni) v3.4.2
- [weave](https://github.com/weaveworks/weave) v2.6.5
- Application
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index ad329dfc2..a24c6173c 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -81,7 +81,7 @@ pod_infra_version: "3.2"
contiv_version: 1.2.1
cilium_version: "v1.8.0"
kube_ovn_version: "v1.2.1"
-kube_router_version: "v0.4.0"
+kube_router_version: "v1.0.0"
multus_version: "v3.4.2"
# Get kubernetes major version (i.e. 1.17.4 => 1.17)
diff --git a/roles/network_plugin/kube-router/templates/kube-router.yml.j2 b/roles/network_plugin/kube-router/templates/kube-router.yml.j2
index 2510a861f..bce36cfbd 100644
--- a/roles/network_plugin/kube-router/templates/kube-router.yml.j2
+++ b/roles/network_plugin/kube-router/templates/kube-router.yml.j2
@@ -39,6 +39,7 @@ spec:
- --run-firewall={{ kube_router_run_firewall | bool }}
- --run-service-proxy={{ kube_router_run_service_proxy | bool }}
- --kubeconfig=/var/lib/kube-router/kubeconfig
+ - --bgp-graceful-restart=true
{% if kube_router_advertise_cluster_ip %}
- --advertise-cluster-ip
{% endif %}
@@ -75,7 +76,7 @@ spec:
httpGet:
path: /healthz
port: 20244
- initialDelaySeconds: 5
+ initialDelaySeconds: 10
periodSeconds: 3
resources:
requests:
@@ -97,6 +98,9 @@ spec:
- name: kubeconfig
mountPath: /var/lib/kube-router
readOnly: true
+ - name: xtables-lock
+ mountPath: /run/xtables.lock
+ readOnly: false
{% if kube_router_enable_metrics %}
ports:
- containerPort: {{ kube_router_metrics_port }}
@@ -128,6 +132,10 @@ spec:
- name: kubeconfig
hostPath:
path: /var/lib/kube-router
+ - name: xtables-lock
+ hostPath:
+ path: /run/xtables.lock
+ type: FileOrCreate
---
apiVersion: v1
--
GitLab