Skip to content

Commit

Permalink
Fix config daemon annotation override
Browse files Browse the repository at this point in the history
A downstream merge [1][2] overrode the annotations in the config
daemonset. This resulted in he sriov-network-config-daemon pod missing
the `target.workload.openshift.io/management` annotation which led to
the pod not being pinned to the management cores when workload
partitioning is enabled.

This is a downstream-only patch.

[1] openshift#868
[2] commit 0f17753

Signed-off-by: Carlos Goncalves <[email protected]>
  • Loading branch information
cgoncalves authored and openshift-cherrypick-robot committed Dec 14, 2023
1 parent f7ea1e3 commit dfb6472
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions bindata/manifests/daemon/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@ spec:
maxUnavailable: 33%
template:
metadata:
annotations:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
labels:
app: sriov-network-config-daemon
component: network
type: infra
openshift.io/component: network
annotations:
kubectl.kubernetes.io/default-container: sriov-network-config-daemon
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
spec:
hostNetwork: true
hostPID: true
Expand Down

0 comments on commit dfb6472

Please sign in to comment.