Skip to content

Commit

Permalink
feat(linkerd-cni): add support for plain iptables commands (#13457)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
alpeb authored Dec 12, 2024
1 parent 9859648 commit a7c41b5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions charts/linkerd2-cni/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Kubernetes: `>=1.22.0-0`
| image.version | string | `"v1.6.0"` | Tag for the CNI container Docker image |
| imagePullSecrets | list | `[]` | |
| inboundProxyPort | int | `4143` | Inbound port for the proxy container |
| iptablesMode | string | `"legacy"` | Variant of iptables that will be used to configure routing |
| 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. |
| logLevel | string | `"info"` | Log level for the CNI plugin |
| outboundProxyPort | int | `4140` | Outbound port for the proxy container |
| podLabels | object | `{}` | Additional labels to add to all pods |
Expand Down Expand Up @@ -68,4 +68,4 @@ Kubernetes: `>=1.22.0-0`
| useWaitFlag | bool | `false` | Configures the CNI plugin to use the -w flag for the iptables command |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)
5 changes: 4 additions & 1 deletion charts/linkerd2-cni/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ destCNINetDir: "/etc/cni/net.d"
destCNIBinDir: "/opt/cni/bin"
# -- Configures the CNI plugin to use the -w flag for the iptables command
useWaitFlag: false
# -- Variant of iptables that will be used to configure routing
# -- Variant of iptables that will be used to configure routing. Allowed values
# are 'nft', 'legacy' and 'plain'. They invoke the 'iptables-nft',
# 'iptables-legacy' and 'iptables' commands respectively. The 'plain' mode is
# targeted at RHEL, which ships with an nftables-based 'iptables' command.
iptablesMode: "legacy"
# -- Disables adding IPv6 rules on top of IPv4 rules
disableIPv6: true
Expand Down

0 comments on commit a7c41b5

Please sign in to comment.