Skip to content

Commit

Permalink
Remove extra env section in whereabouts-reconciler daemonset
Browse files Browse the repository at this point in the history
WHEREABOUTS_NAMESPACE env var was mistakenly added in a separate
env section which doesn't take effect.

WHEREABOUTS_NAMESPACE env var is used by whereabouts-reconciler
to garbage collect the Pod IPs. When unset, it defaults to
kube-system namespace, while ippool.whereabouts.cni.cncf.io
custom resource only exist in openshift-multus namespace on
openshift.

Signed-off-by: Zenghui Shi <zshi@redhat.com>
  • Loading branch information
zshi-redhat committed Dec 12, 2023
1 parent fbb89ed commit fcf831e
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions bindata/network/multus/multus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -726,11 +726,6 @@ spec:
- >
/usr/src/whereabouts/bin/entrypoint.sh -log-level debug
image: {{.WhereaboutsImage}}
env:
- name: WHEREABOUTS_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
resources:
requests:
cpu: "50m"
Expand All @@ -747,6 +742,10 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
- name: WHEREABOUTS_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: KUBERNETES_SERVICE_PORT
value: "{{.KUBERNETES_SERVICE_PORT}}"
- name: KUBERNETES_SERVICE_HOST
Expand Down

0 comments on commit fcf831e

Please sign in to comment.