Skip to content

Commit a7c41b5

Browse files
authored
feat(linkerd-cni): add support for plain iptables commands (#13457)
* feat(linkerd-cni): add support for plain iptables commands This goes along with linkerd/linkerd2-proxy-init#449, that adds a new value for the linkerd2-cni chart's `iptableMode` config. Only a doc change. * s/default/plain
1 parent 9859648 commit a7c41b5

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

charts/linkerd2-cni/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Kubernetes: `>=1.22.0-0`
3535
| image.version | string | `"v1.6.0"` | Tag for the CNI container Docker image |
3636
| imagePullSecrets | list | `[]` | |
3737
| inboundProxyPort | int | `4143` | Inbound port for the proxy container |
38-
| iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing |
38+
| iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing. Allowed values are 'nft', 'legacy' and 'plain'. They invoke 'iptables-nft', 'iptables-legacy' and 'iptables' commands respectively. The 'plain' mode is targeted at RHEL, which ships with an nftables-based 'iptables' command. |
3939
| logLevel | string | `"info"` | Log level for the CNI plugin |
4040
| outboundProxyPort | int | `4140` | Outbound port for the proxy container |
4141
| podLabels | object | `{}` | Additional labels to add to all pods |
@@ -68,4 +68,4 @@ Kubernetes: `>=1.22.0-0`
6868
| useWaitFlag | bool | `false` | Configures the CNI plugin to use the -w flag for the iptables command |
6969

7070
----------------------------------------------
71-
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
71+
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)

charts/linkerd2-cni/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ destCNINetDir: "/etc/cni/net.d"
2828
destCNIBinDir: "/opt/cni/bin"
2929
# -- Configures the CNI plugin to use the -w flag for the iptables command
3030
useWaitFlag: false
31-
# -- Variant of iptables that will be used to configure routing
31+
# -- Variant of iptables that will be used to configure routing. Allowed values
32+
# are 'nft', 'legacy' and 'plain'. They invoke the 'iptables-nft',
33+
# 'iptables-legacy' and 'iptables' commands respectively. The 'plain' mode is
34+
# targeted at RHEL, which ships with an nftables-based 'iptables' command.
3235
iptablesMode: "legacy"
3336
# -- Disables adding IPv6 rules on top of IPv4 rules
3437
disableIPv6: true

0 commit comments

Comments
 (0)