Skip to content

[release-4.19] OCPBUGS-57134: whereabouts-config is a reserved name for user interaction. #2719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release-4.19
Choose a base branch
from
Open

[release-4.19] OCPBUGS-57134: whereabouts-config is a reserved name for user interaction. #2719

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions bindata/network/multus/multus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
name: whereabouts-config
name: whereabouts-flatfile-config
namespace: openshift-multus
data:
whereabouts.conf: |
Expand All @@ -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"
}
---
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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}}"
Expand All @@ -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}}
---
---