Skip to content

CNTRLPLANE-3237: Retry APIServer CR update on conflict in SetAndWaitForEncryptionType #2353

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
Jul 10, 2026
+16 −9
Merged

CNTRLPLANE-3237: Retry APIServer CR update on conflict in SetAndWaitForEncryptionType #2353

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
25 changes: 16 additions & 9 deletions test/library/encryption/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,28 @@ func SetAndWaitForEncryptionType(ctx context.Context, t testing.TB, provider Enc
lastMigratedKeyMeta, err := GetLastKeyMeta(t, clientSet.Kube, namespace, labelSelector)
require.NoError(t, err)

apiServer, err := clientSet.ApiServerConfig.Get(ctx, "cluster", metav1.GetOptions{})
require.NoError(t, err)
previousEncryption := apiServer.Spec.Encryption
needsUpdate := !equality.Semantic.DeepEqual(previousEncryption, provider.APIServerEncryption)
if needsUpdate {
var previousEncryption configv1.APIServerEncryption
var needsUpdate bool
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
apiServer, err := clientSet.ApiServerConfig.Get(ctx, "cluster", metav1.GetOptions{})
if err != nil {
return err
}
previousEncryption = apiServer.Spec.Encryption
needsUpdate = !equality.Semantic.DeepEqual(previousEncryption, provider.APIServerEncryption)
if !needsUpdate {
t.Logf("APIServer is already configured to use %q mode", provider.Type)
return nil
}
if provider.Setup != nil {
provider.Setup(ctx, t)
}
t.Logf("Updating encryption configuration for APIServer from %#v to %#v", previousEncryption, provider.APIServerEncryption)
apiServer.Spec.Encryption = provider.APIServerEncryption
_, err = clientSet.ApiServerConfig.Update(ctx, apiServer, metav1.UpdateOptions{})
require.NoError(t, err)
} else {
t.Logf("APIServer is already configured to use %q mode", provider.Type)
}
return err
})
require.NoError(t, err)

// KMS-to-KMS migration: when both old and new are KMS but the config differs,
// the key controller creates a new key. We must wait for the next migrated key
Expand Down