Skip to content

Commit

Permalink
Merge pull request openshift#874 from openshift-cherrypick-robot/cher…
Browse files Browse the repository at this point in the history
…ry-pick-873-to-release-4.15

[release-4.15] OCPBUGS-25407: Fix config daemon annotation override
  • Loading branch information
openshift-merge-bot[bot] authored Dec 21, 2023
2 parents f7ea1e3 + dfb6472 commit 5042b58
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 5042b58

Please sign in to comment.