diff --git a/build/charts/antrea/README.md b/build/charts/antrea/README.md index 0541add35d5..31b3820764a 100644 --- a/build/charts/antrea/README.md +++ b/build/charts/antrea/README.md @@ -69,7 +69,7 @@ Kubernetes: `>= 1.16.0-0` | controller.podLabels | object | `{}` | Labels to be added to antrea-controller Pod. | | controller.priorityClassName | string | `"system-cluster-critical"` | Prority class to use for the antrea-controller Pod. | | controller.selfSignedCert | bool | `true` | Indicates whether to use auto-generated self-signed TLS certificates. If false, a Secret named "antrea-controller-tls" must be provided with the following keys: ca.crt, tls.crt, tls.key. | -| controller.tolerations | list | `[{"key":"CriticalAddonsOnly","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane"}]` | Tolerations for the antrea-controller Pod. | +| controller.tolerations | list | `[{"key":"CriticalAddonsOnly","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane"},{"effect":"NoExecute","key":"node.kubernetes.io/unreachable","operator":"Exists","tolerationSeconds":0}]` | Tolerations for the antrea-controller Pod. | | defaultMTU | int | `0` | Default MTU to use for the host gateway interface and the network interface of each Pod. By default, antrea-agent will discover the MTU of the Node's primary interface and adjust it to accommodate for tunnel encapsulation overhead if applicable. | | disableTXChecksumOffload | bool | `false` | Disable TX checksum offloading for container network interfaces. It's supposed to be set to true when the datapath doesn't support TX checksum offloading, which causes packets to be dropped due to bad checksum. It affects Pods running on Linux Nodes only. | | dnsServerOverride | string | `""` | Address of DNS server, to override the kube-dns Service. It's used to resolve hostnames in a FQDN policy. | diff --git a/build/charts/antrea/values.yaml b/build/charts/antrea/values.yaml index d668428a88b..f3eb6326bd6 100644 --- a/build/charts/antrea/values.yaml +++ b/build/charts/antrea/values.yaml @@ -296,6 +296,13 @@ controller: # Control-plane taint for Kubernetes >= 1.24. - key: node-role.kubernetes.io/control-plane effect: NoSchedule + # Evict it immediately once Node is detected unreachable. + # Must be set explicitly, otherwise DefaultTolerationSeconds plugin will + # add a default toleration with tolerationSeconds of 300s. + - key: node.kubernetes.io/unreachable + effect: NoExecute + operator: Exists + tolerationSeconds: 0 # -- Node selector for the antrea-controller Pod. nodeSelector: kubernetes.io/os: linux diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml index ecafb6e83d1..7509d4dcd60 100644 --- a/build/yamls/antrea-aks.yml +++ b/build/yamls/antrea-aks.yml @@ -7078,6 +7078,10 @@ spec: key: node-role.kubernetes.io/master - effect: NoSchedule key: node-role.kubernetes.io/control-plane + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 0 serviceAccountName: antrea-controller containers: - name: antrea-controller diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml index cba8f0bb121..20f6f19fed1 100644 --- a/build/yamls/antrea-eks.yml +++ b/build/yamls/antrea-eks.yml @@ -7079,6 +7079,10 @@ spec: key: node-role.kubernetes.io/master - effect: NoSchedule key: node-role.kubernetes.io/control-plane + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 0 serviceAccountName: antrea-controller containers: - name: antrea-controller diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml index a96c1c8e562..e1c8c3ce8a6 100644 --- a/build/yamls/antrea-gke.yml +++ b/build/yamls/antrea-gke.yml @@ -7076,6 +7076,10 @@ spec: key: node-role.kubernetes.io/master - effect: NoSchedule key: node-role.kubernetes.io/control-plane + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 0 serviceAccountName: antrea-controller containers: - name: antrea-controller diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml index b2c0f48f174..b30d947126a 100644 --- a/build/yamls/antrea-ipsec.yml +++ b/build/yamls/antrea-ipsec.yml @@ -7135,6 +7135,10 @@ spec: key: node-role.kubernetes.io/master - effect: NoSchedule key: node-role.kubernetes.io/control-plane + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 0 serviceAccountName: antrea-controller containers: - name: antrea-controller diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml index c92fc5feb1c..e30a5c3edff 100644 --- a/build/yamls/antrea.yml +++ b/build/yamls/antrea.yml @@ -7076,6 +7076,10 @@ spec: key: node-role.kubernetes.io/master - effect: NoSchedule key: node-role.kubernetes.io/control-plane + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 0 serviceAccountName: antrea-controller containers: - name: antrea-controller