From 1ce628e7cf50da2eb8b35fb3dd7578fed0fdb36b Mon Sep 17 00:00:00 2001
From: dougbtv <dosmith@redhat.com>
Date: Tue, 13 May 2025 09:16:11 -0400
Subject: [PATCH] whereabouts-config is a reserved name for user interaction.

In changing to using the flatfile configuration for usage as a configmap, we clobbered the name that we use for allowing overriding the reconciler schedule.

See also: https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/networking/multiple-networks#nw-multus-configuring-whereabouts-ip-reconciler-schedule_configuring-additional-network
---
 bindata/network/multus/multus.yaml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/bindata/network/multus/multus.yaml b/bindata/network/multus/multus.yaml
index 59444eceeb..ec603e563a 100644
--- a/bindata/network/multus/multus.yaml
+++ b/bindata/network/multus/multus.yaml
@@ -109,7 +109,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: whereabouts-config
+  name: whereabouts-flatfile-config
   namespace: openshift-multus
 data:
   whereabouts.conf: |
@@ -119,8 +119,7 @@ data:
         "kubeconfig": "/etc/kubernetes/cni/net.d/whereabouts.d/whereabouts.kubeconfig"
       },
       "reconciler_cron_expression": "30 4 * * *",
-      "log_level": "debug",
-      "log_file": "/tmp/whereabouts.log",
+      "log_level": "verbose",
       "configuration_path": "/etc/kubernetes/cni/net.d/whereabouts.d"
     }
 ---
@@ -714,7 +713,7 @@ spec:
           name: cnibin
         - name: system-cni-dir
           mountPath: /host/etc/cni/net.d
-        - name: whereabouts-configmap
+        - name: whereabouts-flatfile-configmap
           mountPath: /etc/whereabouts/config
         env:
         - name: NODENAME
@@ -775,9 +774,9 @@ spec:
           configMap:
             name: {{.CniSysctlAllowlist}}
             defaultMode: 0744
-        - name: whereabouts-configmap
+        - name: whereabouts-flatfile-configmap
           configMap:
-            name: whereabouts-config
+            name: whereabouts-flatfile-config
 {{if .RenderWhereaboutsAuxillary}}
 ---
 apiVersion: apps/v1
@@ -904,7 +903,7 @@ spec:
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
             - mountPath: /host/etc/cni/net.d/whereabouts.d/whereabouts.conf
-              name: whereabouts-configmap
+              name: whereabouts-flatfile-configmap
               subPath: whereabouts.conf
       preemptionPolicy: PreemptLowerPriority
       priorityClassName: "system-node-critical"
@@ -920,9 +919,9 @@ spec:
             path: {{ .SystemCNIConfDir }}
             type: Directory          
           name: cni-net-dir
-        - name: whereabouts-configmap
+        - name: whereabouts-flatfile-configmap
           configMap:
-            name: whereabouts-config
+            name: whereabouts-flatfile-config
             items:
             - key: whereabouts.conf
               path: whereabouts.conf
@@ -1069,8 +1068,8 @@ spec:
             memory: 10Mi
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
-        - name: whereabouts-configmap
-          mountPath: /etc/wherabouts/config
+        - name: whereabouts-flatfile-configmap
+          mountPath: /etc/whereabouts/config
         env:
         - name: KUBERNETES_SERVICE_PORT
           value: "{{.KUBERNETES_SERVICE_PORT}}"
@@ -1085,8 +1084,8 @@ spec:
         - name: WHEREABOUTS_NAMESPACE
           value: "openshift-multus"
       volumes:
-        - name: whereabouts-configmap
+        - name: whereabouts-flatfile-configmap
           configMap:
-            name: whereabouts-config
+            name: whereabouts-flatfile-config
 {{- end}}
----
\ No newline at end of file
+---