Skip to content

Commit b1ee547

Browse files
committed
oidc: only remove keycloak resources after switching back from OIDC authn type
so that the console operator does not enter a degraded state because we moved the CA for the keycloak deployment Signed-off-by: Bryce Palmer <[email protected]>
1 parent e920064 commit b1ee547

File tree

1 file changed

+3
-3
lines changed
  • test/extended/authentication

1 file changed

+3
-3
lines changed

test/extended/authentication/oidc.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,16 +364,16 @@ var _ = g.Describe("[sig-auth][Suite:openshift/auth/external-oidc][Serial][Slow]
364364
})
365365

366366
g.AfterAll(func() {
367-
err := removeResources(ctx, cleanups...)
368-
o.Expect(err).NotTo(o.HaveOccurred(), "should not encounter an error cleaning up keycloak resources")
369-
370367
err, modified := resetAuthentication(ctx, oc, originalAuth)
371368
o.Expect(err).NotTo(o.HaveOccurred(), "should not encounter an error reverting authentication to original state")
372369

373370
// Only if we modified the Authentication resource during the reset should we wait for a rollout
374371
if modified {
375372
waitForRollout(ctx, oc)
376373
}
374+
375+
err = removeResources(ctx, cleanups...)
376+
o.Expect(err).NotTo(o.HaveOccurred(), "should not encounter an error cleaning up keycloak resources")
377377
})
378378
})
379379

0 commit comments

Comments
 (0)