Merge pull request #5844 from pacevedom/rebase-sriov-4.20.0-202511182227

openshift-merge-bot[bot] · web-flow · commit e956e17e0c45 · 2025-12-03T17:31:00.000Z
USHIFT-6357: Fix serviceaccount generation in SRIOV rebase
diff --git a/assets/optional/sriov/deploy/serviceaccount.yaml b/assets/optional/sriov/deploy/serviceaccount.yaml
@@ -1,5 +1,12 @@
 apiVersion: v1
 kind: ServiceAccount
+metadata:
+  creationTimestamp: null
+  name: sriov-network-config-daemon
+  namespace: sriov-network-operator
+---
+apiVersion: v1
+kind: ServiceAccount
 metadata:
   creationTimestamp: null
   name: sriov-network-operator
diff --git a/scripts/auto-rebase/rebase_sriov.sh b/scripts/auto-rebase/rebase_sriov.sh
@@ -234,7 +234,7 @@ metadata:
   namespace: ${namespace}
 EOL
     )
-    echo "${serviceAccount}" > "${target}"
+    echo "${serviceAccount}" >> "${target}"
 }
 
 # extract_operator_from_csv() extracts the operator manifest from cluster

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ metadata:`
`234`	`234`	`namespace: ${namespace}`
`235`	`235`	`EOL`
`236`	`236`	`)`
`237`		`- echo "${serviceAccount}" > "${target}"`
	`237`	`+ echo "${serviceAccount}" >> "${target}"`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`# extract_operator_from_csv() extracts the operator manifest from cluster`