From 20f6083d6fabfcce302a1c43d81ddf639a23f7a6 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 9 Mar 2020 13:30:20 +0100 Subject: [PATCH] helm: allow to configure bpf-nat-global-max using Helm Set the value to the current value of option.NATMapEntriesGlobalDefault A successive PR will reduce it for #10056 Signed-off-by: Tobias Klauser --- .../kubernetes/cilium/charts/config/templates/configmap.yaml | 4 ++++ install/kubernetes/cilium/values.yaml | 3 +++ install/kubernetes/quick-install.yaml | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/install/kubernetes/cilium/charts/config/templates/configmap.yaml b/install/kubernetes/cilium/charts/config/templates/configmap.yaml index a40dc9a9d10d..c436d3bd3554 100644 --- a/install/kubernetes/cilium/charts/config/templates/configmap.yaml +++ b/install/kubernetes/cilium/charts/config/templates/configmap.yaml @@ -136,6 +136,10 @@ data: bpf-ct-global-tcp-max: "{{ .Values.global.bpf.ctTcpMax }}" bpf-ct-global-any-max: "{{ .Values.global.bpf.ctAnyMax }}" + # bpf-nat-global-max specified the maximum number of entries in the BPF NAT + # table. + bpf-nat-global-max: "{{ .Values.global.bpf.natMax }}" + # Pre-allocation of map entries allows per-packet latency to be reduced, at # the expense of up-front memory allocation for the entries in the maps. The # default value below will minimize memory usage in the default installation; diff --git a/install/kubernetes/cilium/values.yaml b/install/kubernetes/cilium/values.yaml index a713795e2078..119893d21845 100644 --- a/install/kubernetes/cilium/values.yaml +++ b/install/kubernetes/cilium/values.yaml @@ -202,6 +202,9 @@ global: # tracking table ctAnyMax: 262144 + # natMax is the maximum number of entries for the NAT table + natMax: 841429 + # montiorAggregation is the level of aggregation for datapath trace events monitorAggregation: medium diff --git a/install/kubernetes/quick-install.yaml b/install/kubernetes/quick-install.yaml index 26fb9a13fe5e..a0a6128a4530 100644 --- a/install/kubernetes/quick-install.yaml +++ b/install/kubernetes/quick-install.yaml @@ -75,6 +75,10 @@ data: bpf-ct-global-tcp-max: "524288" bpf-ct-global-any-max: "262144" + # bpf-nat-global-max specified the maximum number of entries in the BPF NAT + # table. + bpf-nat-global-max: "841429" + # Pre-allocation of map entries allows per-packet latency to be reduced, at # the expense of up-front memory allocation for the entries in the maps. The # default value below will minimize memory usage in the default installation;