diff --git a/Dockerfile.openshift b/Dockerfile.openshift index e5e151f3..0791c118 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -17,7 +17,4 @@ LABEL io.k8s.display-name="Multus NetworkPolicy" \ io.openshift.tags="openshift" \ maintainer="Doug Smith " -# TODO: compatibility layer with the original multus-networkpolicy-iptables image. Remove this once the ClsuterNetworkOperator is updated to use the nftables implementation. -RUN ln -s /usr/bin/multi-networkpolicy-nftables /usr/bin/multi-networkpolicy-iptables - ENTRYPOINT ["multi-networkpolicy-nftables"] diff --git a/cmd/main.go b/cmd/main.go index 4995d8d6..409b8712 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -64,10 +64,6 @@ func run() error { flag.StringVar(&customIPv6IngressRuleFile, "custom-v6-ingress-rule-file", "", "custom rule file for IPv6 ingress") flag.StringVar(&customIPv6EgressRuleFile, "custom-v6-egress-rule-file", "", "custom rule file for IPv6 egress") - // TODO: compatibility layer with the multus-networkpolicy-iptables image. Remove this once the ClsuterNetworkOperator is updated to use the nftables implementation. - var podIptables string - flag.StringVar(&podIptables, "pod-iptables", "", "compatibility layer") - opts := zap.Options{ Development: true, } @@ -106,27 +102,10 @@ func run() error { return fmt.Errorf("unable to get custom nftables rules: %w", err) } - // TODO: compatibility layer with the multus-networkpolicy-iptables image. Remove this once the ClsuterNetworkOperator is updated to use the nftables implementation. - commonRules = &nftables.CommonRules{} - // Set ICMP acceptance rules commonRules.AcceptICMP = acceptICMP commonRules.AcceptICMPv6 = acceptICMPv6 - // TODO: put this in ClusterNetworkOperator - commonRules.CustomIPv6EgressRules = []string{ - "icmpv6 type nd-neighbor-solicit accept", - "icmpv6 type nd-neighbor-advert accept", - "icmpv6 type nd-router-advert accept", - "icmpv6 type nd-router-solicit accept", - } - commonRules.CustomIPv6IngressRules = []string{ - "icmpv6 type nd-neighbor-solicit accept", - "icmpv6 type nd-neighbor-advert accept", - "icmpv6 type nd-router-advert accept", - "icmpv6 type nd-router-solicit accept", - } - setupLog.Info("Common rules applied to all pods affected by MultiNetworkPolicies", "rules", commonRules) ctx := ctrl.SetupSignalHandler()