Skip to content

OCPBUGS-79397: Fix SA restore resourceVersion conflict error #1264

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

Merged
openshift-merge-bot merged 1 commit into from
Mar 24, 2026
Merged

OCPBUGS-79397: Fix SA restore resourceVersion conflict error #1264

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
4 changes: 3 additions & 1 deletion tests-extension/test/qe/util/olmv0util/sa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ func (sa *serviceAccountDescription) Delete(oc *exutil.CLI) {

// Reapply recreates the ServiceAccount using the previously exported definition
// This method restores a ServiceAccount from its saved configuration file
// Uses 'replace --force' to handle race conditions where OLM may have already
// recreated the SA with a different resourceVersion
//
// Parameters:
// - oc: OpenShift CLI client for executing commands
func (sa *serviceAccountDescription) Reapply(oc *exutil.CLI) {
err := oc.AsAdmin().WithoutNamespace().Run("apply").Args("-f", sa.definitionfile).Execute()
err := oc.AsAdmin().WithoutNamespace().Run("replace").Args("--force", "-f", sa.definitionfile).Execute()
o.Expect(err).NotTo(o.HaveOccurred())
}

Expand Down