Remove Whereabouts installation (#5744)

As we switched secondary network IPAM to Antrea native IPAM, Whereabouts
is no longer needed. So, this commit removes Whereabouts installation.
from the antrea-agent Helm charts and remove the Whereabouts CNI binary
from the antrea-agent Docker image.

Signed-off-by: Jianjun Shen <shenj@vmware.com>

build/charts/antrea/README.md

@@ -137,7 +137,6 @@ Kubernetes: `>= 1.16.0-0`
 | tunnelPort | int | `0` | TunnelPort is the destination port for UDP and TCP based tunnel protocols (Geneve, VXLAN, and STT). If zero, it will use the assigned IANA port for the protocol, i.e. 6081 for Geneve, 4789 for VXLAN, and 7471 for STT. |
 | tunnelType | string | `"geneve"` | Tunnel protocol used for encapsulating traffic across Nodes. It must be one of "geneve", "vxlan", "gre", "stt". |
 | webhooks.labelsMutator.enable | bool | `false` | Mutate all namespaces to add the "antrea.io/metadata.name" label. |
-| whereabouts.enable | bool | `false` | Install and configure Whereabouts, for use by the antrea-agent. |
 | wireGuard.port | int | `51820` | Port for WireGuard to send and receive traffic. |
 
 ----------------------------------------------

build/charts/antrea/templates/NOTES.txt

@@ -1,3 +1,4 @@
+{{- include "validateValues" . }}
 The Antrea CNI has been successfully installed
 
 You are using version {{ .Chart.Version }}

build/charts/antrea/templates/_helpers.tpl

@@ -21,3 +21,9 @@
 {{- define "antreaImage" -}}
 {{- print .Values.image.repository ":" (include "antreaImageTag" .) -}}
 {{- end -}}
+
+{{- define "validateValues" -}}
+{{- if (.Values.whereabouts).enable -}}
+{{- fail "Whereabouts is no longer included with Antrea and whereabouts.enable must not be set" -}}
+{{- end -}}
+{{- end -}}

build/charts/antrea/templates/agent/daemonset.yaml

@@ -67,19 +67,6 @@ spec:
       {{- end }}
       serviceAccountName: antrea-agent
       initContainers:
-        {{- if .Values.whereabouts.enable }}
-        - name: install-whereabouts-config
-          image: {{ include "antreaImage" . | quote }}
-          resources:
-            requests:
-              cpu: "100m"
-          command: ["install_whereabouts_config"]
-          volumeMounts:
-          - name: whereabouts-cni-conf
-            mountPath: /host/etc/cni/net.d/whereabouts.d
-          - name: whereabouts-secret
-            mountPath: /var/run/secrets/whereabouts
-        {{- end }}
       {{- if eq .Values.trafficEncapMode "networkPolicyOnly" }}
       containers:
       {{- end }}
@@ -260,12 +247,6 @@ spec:
             mountPropagation: HostToContainer
           - name: xtables-lock
             mountPath: /run/xtables.lock
-          {{- if .Values.whereabouts.enable }}
-          - name: whereabouts-cni-conf
-            mountPath: /host/etc/cni/net.d/whereabouts.d
-          - name: whereabouts-secret
-            mountPath: /var/run/secrets/whereabouts
-          {{- end }}
           {{- with .Values.agent.antreaAgent.extraVolumeMounts }}
           {{- toYaml . | trim | nindent 10 }}
           {{- end }}
@@ -397,11 +378,3 @@ spec:
         {{- with .Values.agent.extraVolumes }}
         {{- toYaml . | trim | nindent 8 }}
         {{- end }}
-        {{- if .Values.whereabouts.enable }}
-        - hostPath:
-            path: /host/etc/cni/net.d/whereabouts.d
-          name: whereabouts-cni-conf
-        - name: whereabouts-secret
-          secret:
-            secretName: whereabouts-cni-secret
-        {{- end }}

build/charts/antrea/values.yaml

@@ -393,10 +393,6 @@ webhooks:
 # -- Global log verbosity switch for all Antrea components.
 logVerbosity: 0
 
-whereabouts:
-  # -- Install and configure Whereabouts, for use by the antrea-agent.
-  enable: false
-
 # Configure Multicluster defaults for both Antrea Controller and Agent.
 multicluster:
   # -- Enable Antrea Multi-cluster Gateway to support cross-cluster traffic.

build/images/base/Dockerfile

@@ -16,7 +16,6 @@ ARG BUILD_TAG
 FROM ubuntu:22.04 as cni-binaries
 
 ARG CNI_BINARIES_VERSION
-ARG WHEREABOUTS_VERSION=v0.6.1
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends wget ca-certificates
@@ -34,8 +33,7 @@ RUN set -eux; \
          *) pluginsArch=''; echo >&2; echo >&2 "unsupported architecture '$dpkgArch'"; echo >&2 ; exit 1 ;; \
     esac; \
     mkdir -p /opt/cni/bin; \
-    wget -q -O - https://github.com/containernetworking/plugins/releases/download/$CNI_BINARIES_VERSION/cni-plugins-linux-${pluginsArch}-$CNI_BINARIES_VERSION.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS; \
-    wget -q -O /opt/cni/bin/whereabouts https://github.com/k8snetworkplumbingwg/whereabouts/releases/download/$WHEREABOUTS_VERSION/whereabouts-${pluginsArch} && chmod +x /opt/cni/bin/whereabouts
+    wget -q -O - https://github.com/containernetworking/plugins/releases/download/$CNI_BINARIES_VERSION/cni-plugins-linux-${pluginsArch}-$CNI_BINARIES_VERSION.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS
 
 FROM antrea/openvswitch:${BUILD_TAG}
 

build/images/base/Dockerfile.ubi

@@ -16,7 +16,6 @@ ARG BUILD_TAG
 FROM ubuntu:22.04 as cni-binaries
 
 ARG CNI_BINARIES_VERSION
-ARG WHEREABOUTS_VERSION=v0.6.1
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends wget ca-certificates
@@ -34,8 +33,7 @@ RUN set -eux; \
          *) pluginsArch=''; echo >&2; echo >&2 "unsupported architecture '$dpkgArch'"; echo >&2 ; exit 1 ;; \
     esac; \
     mkdir -p /opt/cni/bin; \
-    wget -q -O - https://github.com/containernetworking/plugins/releases/download/$CNI_BINARIES_VERSION/cni-plugins-linux-${pluginsArch}-$CNI_BINARIES_VERSION.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS; \
-    wget -q -O /opt/cni/bin/whereabouts https://github.com/k8snetworkplumbingwg/whereabouts/releases/download/$WHEREABOUTS_VERSION/whereabouts-${pluginsArch} && chmod +x /opt/cni/bin/whereabouts
+    wget -q -O - https://github.com/containernetworking/plugins/releases/download/$CNI_BINARIES_VERSION/cni-plugins-linux-${pluginsArch}-$CNI_BINARIES_VERSION.tgz | tar xz -C /opt/cni/bin $CNI_PLUGINS
 
 FROM antrea/openvswitch-ubi:${BUILD_TAG}
 

hack/generate-manifest.sh

@@ -39,7 +39,6 @@ Generate a YAML manifest for Antrea using Helm and print it to stdout.
         --hw-offload                  Generates a manifest with hw-offload enabled in the antrea-ovs container.
         --sriov                       Generates a manifest which enables use of Kubelet API for SR-IOV device info.
         --flexible-ipam               Generates a manifest with flexible IPAM enabled.
-        --whereabouts                 Generates a manifest which enables whereabouts configuration for secondary network IPAM.
         --help, -h                    Print this message and exit
         --multicast                   Generates a manifest for multicast.
         --multicast-interfaces        Multicast interface names (default is empty)
@@ -78,7 +77,6 @@ SIMULATOR=false
 CUSTOM_ADM_CONTROLLER=false
 HW_OFFLOAD=false
 SRIOV=false
-WHEREABOUTS=false
 FLEXIBLE_IPAM=false
 MULTICAST=false
 MULTICAST_INTERFACES=""
@@ -155,15 +153,11 @@ case $key in
     --sriov)
     SRIOV=true
     shift
-    ;;   
+    ;;
     --flexible-ipam)
     FLEXIBLE_IPAM=true
     shift
     ;;
-    --whereabouts)
-    WHEREABOUTS=true
-    shift
-    ;;
     --multicast)
     MULTICAST=true
     shift
@@ -328,10 +322,6 @@ EOF
     HELM_VALUES_FILES+=("$TMP_DIR/sriov.yml")
 fi
 
-if $WHEREABOUTS; then
-    HELM_VALUES+=("whereabouts.enable=true")
-fi
-
 if [ "$MODE" == "dev" ]; then
     if [[ -z "$IMG_NAME" ]]; then
         if $COVERAGE; then