From 8f0bcfb2ac3f623e4b27c6043c656eb4ff7550e2 Mon Sep 17 00:00:00 2001 From: Luke Alexander Date: Mon, 24 Jun 2019 16:35:25 +0100 Subject: [PATCH] Enabling --bgp-graceful-restart by default when the router component is deployed via daemonset --- .../generic-kuberouter-all-features-advertise-routes.yaml | 3 ++- daemonset/generic-kuberouter-all-features.yaml | 3 ++- daemonset/generic-kuberouter-only-advertise-routes.yaml | 1 + daemonset/generic-kuberouter.yaml | 3 ++- ...kube-router-all-service-daemonset-advertise-routes.yaml | 1 + daemonset/kube-router-all-service-daemonset.yaml | 7 ++++++- daemonset/kube-router-firewall-daemonset.yaml | 6 +++++- daemonset/kube-router-proxy-daemonset.yaml | 6 +++++- daemonset/kubeadm-kuberouter-all-features-dsr.yaml | 1 + daemonset/kubeadm-kuberouter-all-features-hostport.yaml | 1 + daemonset/kubeadm-kuberouter-all-features.yaml | 1 + daemonset/kubeadm-kuberouter.yaml | 1 + 12 files changed, 28 insertions(+), 6 deletions(-) diff --git a/daemonset/generic-kuberouter-all-features-advertise-routes.yaml b/daemonset/generic-kuberouter-all-features-advertise-routes.yaml index d28444ed..04910e93 100644 --- a/daemonset/generic-kuberouter-all-features-advertise-routes.yaml +++ b/daemonset/generic-kuberouter-all-features-advertise-routes.yaml @@ -70,6 +70,7 @@ spec: - "--run-router=true" - "--run-firewall=true" - "--run-service-proxy=true" + - "--bgp-graceful-restart=true" - "--kubeconfig=/var/lib/kube-router/kubeconfig" - "--peer-router-ips=10.1.201.254" - "--peer-router-asns=64512" @@ -130,7 +131,7 @@ spec: - mountPath: /etc/kube-router name: kube-router-cfg - name: kubeconfig - mountPath: /var/lib/kube-router + mountPath: /var/lib/kube-router hostNetwork: true tolerations: - key: CriticalAddonsOnly diff --git a/daemonset/generic-kuberouter-all-features.yaml b/daemonset/generic-kuberouter-all-features.yaml index bf7c90b7..39ec9c87 100644 --- a/daemonset/generic-kuberouter-all-features.yaml +++ b/daemonset/generic-kuberouter-all-features.yaml @@ -70,6 +70,7 @@ spec: - "--run-router=true" - "--run-firewall=true" - "--run-service-proxy=true" + - "--bgp-graceful-restart=true" - "--kubeconfig=/var/lib/kube-router/kubeconfig" env: - name: NODE_NAME @@ -126,7 +127,7 @@ spec: - mountPath: /etc/kube-router name: kube-router-cfg - name: kubeconfig - mountPath: /var/lib/kube-router + mountPath: /var/lib/kube-router hostNetwork: true tolerations: - key: CriticalAddonsOnly diff --git a/daemonset/generic-kuberouter-only-advertise-routes.yaml b/daemonset/generic-kuberouter-only-advertise-routes.yaml index 1daaf2a7..d98a731f 100644 --- a/daemonset/generic-kuberouter-only-advertise-routes.yaml +++ b/daemonset/generic-kuberouter-only-advertise-routes.yaml @@ -25,6 +25,7 @@ spec: - "--run-router=true" - "--run-firewall=false" - "--run-service-proxy=false" + - "--bgp-graceful-restart=true" - "--enable-cni=false" - "--enable-ibgp=false" - "--enable-overlay=false" diff --git a/daemonset/generic-kuberouter.yaml b/daemonset/generic-kuberouter.yaml index a07cfd0c..6866082a 100644 --- a/daemonset/generic-kuberouter.yaml +++ b/daemonset/generic-kuberouter.yaml @@ -51,6 +51,7 @@ spec: - "--run-router=true" - "--run-firewall=true" - "--run-service-proxy=false" + - "--bgp-graceful-restart=true" env: - name: NODE_NAME valueFrom: @@ -96,7 +97,7 @@ spec: - mountPath: /etc/cni/net.d name: cni-conf-dir - mountPath: /etc/kube-router - name: kube-router-cfg + name: kube-router-cfg hostNetwork: true tolerations: - key: CriticalAddonsOnly diff --git a/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml b/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml index ebe33ad2..917c509f 100644 --- a/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml +++ b/daemonset/kube-router-all-service-daemonset-advertise-routes.yaml @@ -46,6 +46,7 @@ spec: - "--run-router=true" - "--run-firewall=true" - "--run-service-proxy=true" + - "--bgp-graceful-restart=true" - "--kubeconfig=/var/lib/kube-router/kubeconfig" - "--advertise-cluster-ip=true" - "--cluster-asn=64512" diff --git a/daemonset/kube-router-all-service-daemonset.yaml b/daemonset/kube-router-all-service-daemonset.yaml index 3be2dfae..880612ed 100644 --- a/daemonset/kube-router-all-service-daemonset.yaml +++ b/daemonset/kube-router-all-service-daemonset.yaml @@ -42,7 +42,12 @@ spec: containers: - name: kube-router image: docker.io/cloudnativelabs/kube-router - args: ["--run-router=true", "--run-firewall=true", "--run-service-proxy=true", "--kubeconfig=/var/lib/kube-router/kubeconfig"] + args: + - "--run-router=true" + - "--run-firewall=true" + - "--run-service-proxy=true" + - "--bgp-graceful-restart=true" + - "--kubeconfig=/var/lib/kube-router/kubeconfig" securityContext: privileged: true imagePullPolicy: Always diff --git a/daemonset/kube-router-firewall-daemonset.yaml b/daemonset/kube-router-firewall-daemonset.yaml index 38f80e38..6f96f3fe 100644 --- a/daemonset/kube-router-firewall-daemonset.yaml +++ b/daemonset/kube-router-firewall-daemonset.yaml @@ -42,7 +42,11 @@ spec: containers: - name: kube-router image: docker.io/cloudnativelabs/kube-router - args: ["--run-router=false", "--run-firewall=true", "--run-service-proxy=false", "--kubeconfig=/var/lib/kube-router/kubeconfig"] + args: + - "--run-router=false" + - "--run-firewall=true" + - "--run-service-proxy=false" + - "--kubeconfig=/var/lib/kube-router/kubeconfig" securityContext: privileged: true imagePullPolicy: Always diff --git a/daemonset/kube-router-proxy-daemonset.yaml b/daemonset/kube-router-proxy-daemonset.yaml index 9d60ee16..b6b21ff2 100644 --- a/daemonset/kube-router-proxy-daemonset.yaml +++ b/daemonset/kube-router-proxy-daemonset.yaml @@ -42,7 +42,11 @@ spec: containers: - name: kube-router image: docker.io/cloudnativelabs/kube-router - args: ["--run-router=false", "--run-firewall=false", "--run-service-proxy=true", "--kubeconfig=/var/lib/kube-router/kubeconfig"] + args: + - "--run-router=false" + - "--run-firewall=false" + - "--run-service-proxy=true" + - "--kubeconfig=/var/lib/kube-router/kubeconfig" securityContext: privileged: true imagePullPolicy: Always diff --git a/daemonset/kubeadm-kuberouter-all-features-dsr.yaml b/daemonset/kubeadm-kuberouter-all-features-dsr.yaml index 1ab75cce..3831a497 100644 --- a/daemonset/kubeadm-kuberouter-all-features-dsr.yaml +++ b/daemonset/kubeadm-kuberouter-all-features-dsr.yaml @@ -51,6 +51,7 @@ spec: - --run-router=true - --run-firewall=true - --run-service-proxy=true + - --bgp-graceful-restart=true - --kubeconfig=/var/lib/kube-router/kubeconfig env: - name: NODE_NAME diff --git a/daemonset/kubeadm-kuberouter-all-features-hostport.yaml b/daemonset/kubeadm-kuberouter-all-features-hostport.yaml index 88dce45f..a6911b55 100644 --- a/daemonset/kubeadm-kuberouter-all-features-hostport.yaml +++ b/daemonset/kubeadm-kuberouter-all-features-hostport.yaml @@ -58,6 +58,7 @@ spec: - --run-router=true - --run-firewall=true - --run-service-proxy=true + - --bgp-graceful-restart=true - --kubeconfig=/var/lib/kube-router/kubeconfig env: - name: NODE_NAME diff --git a/daemonset/kubeadm-kuberouter-all-features.yaml b/daemonset/kubeadm-kuberouter-all-features.yaml index bc40d41f..548328fc 100644 --- a/daemonset/kubeadm-kuberouter-all-features.yaml +++ b/daemonset/kubeadm-kuberouter-all-features.yaml @@ -51,6 +51,7 @@ spec: - --run-router=true - --run-firewall=true - --run-service-proxy=true + - --bgp-graceful-restart=true - --kubeconfig=/var/lib/kube-router/kubeconfig env: - name: NODE_NAME diff --git a/daemonset/kubeadm-kuberouter.yaml b/daemonset/kubeadm-kuberouter.yaml index 455d31b2..352ae116 100644 --- a/daemonset/kubeadm-kuberouter.yaml +++ b/daemonset/kubeadm-kuberouter.yaml @@ -51,6 +51,7 @@ spec: - --run-router=true - --run-firewall=true - --run-service-proxy=false + - --bgp-graceful-restart=true env: - name: NODE_NAME valueFrom: