Skip to content

CNTRLPLANE-3237: kms preflight: replace CoreV1Interface with SecretsGetter and ConfigMapsGetter #2403

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
Aug 4, 2026
+23 −18
Merged

CNTRLPLANE-3237: kms preflight: replace CoreV1Interface with SecretsGetter and ConfigMapsGetter #2403

Show file tree
Hide file tree
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
38 changes: 21 additions & 17 deletions pkg/operator/encryption/controllers/kms_preflight_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,20 @@ var _ kmsConfigHasherResourceProvider = &coreClientKMSConfigHasherResourceProvid

// coreClientKMSConfigHasherResourceProvider fetches resources from the Kubernetes API.
type coreClientKMSConfigHasherResourceProvider struct {
coreClient corev1client.CoreV1Interface
secretsClient corev1client.SecretsGetter
configMapsClient corev1client.ConfigMapsGetter
}

func newCoreClientKMSConfigHasherResourceProvider(coreClient corev1client.CoreV1Interface) *coreClientKMSConfigHasherResourceProvider {
return &coreClientKMSConfigHasherResourceProvider{coreClient: coreClient}
func newCoreClientKMSConfigHasherResourceProvider(secretsClient corev1client.SecretsGetter, configMapsClient corev1client.ConfigMapsGetter) *coreClientKMSConfigHasherResourceProvider {
return &coreClientKMSConfigHasherResourceProvider{secretsClient: secretsClient, configMapsClient: configMapsClient}
}

func (p *coreClientKMSConfigHasherResourceProvider) getSecret(ctx context.Context, namespace, name string) (*corev1.Secret, error) {
return p.coreClient.Secrets(namespace).Get(ctx, name, metav1.GetOptions{})
return p.secretsClient.Secrets(namespace).Get(ctx, name, metav1.GetOptions{})
}

func (p *coreClientKMSConfigHasherResourceProvider) getConfigMap(ctx context.Context, namespace, name string) (*corev1.ConfigMap, error) {
return p.coreClient.ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{})
return p.configMapsClient.ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{})
}

type kmsConfigHasher struct {
Expand Down Expand Up @@ -198,9 +199,10 @@ type KMSPreflightDeployer interface {
type kmsPreflightController struct {
controllerInstanceName string

operatorClient operatorv1helpers.OperatorClient
apiServerClient configv1client.APIServerInterface
coreClient corev1client.CoreV1Interface
operatorClient operatorv1helpers.OperatorClient
apiServerClient configv1client.APIServerInterface
secretsClient corev1client.SecretsGetter
configMapsClient corev1client.ConfigMapsGetter

deployer KMSPreflightDeployer
provider Provider
Expand Down Expand Up @@ -286,20 +288,22 @@ func NewKMSPreflightController(
operatorClient operatorv1helpers.OperatorClient,
apiServerClient configv1client.APIServerInterface,
apiServerInformer configv1informers.APIServerInformer,
// coreClient reads referenced Secrets and ConfigMaps in openshift-config for hash
// computation. No informer is needed: the key-controller detects config changes and
// updates ObservedConfigHash, which triggers this controller via the operatorClient
// informer. The minute-based resync covers the rest.
coreClient corev1client.CoreV1Interface,
// secretsClient and configMapsClient read referenced Secrets and ConfigMaps in
// openshift-config for hash computation. No informer is needed: the key-controller
// detects config changes and updates ObservedConfigHash, which triggers this
// controller via the operatorClient informer. The minute-based resync covers the rest.
secretsClient corev1client.SecretsGetter,
configMapsClient corev1client.ConfigMapsGetter,
encryptionStatusProvider kms.EncryptionStatusProvider,
eventRecorder events.Recorder,
) factory.Controller {
c := &kmsPreflightController{
controllerInstanceName: factory.ControllerInstanceName(instanceName, "EncryptionKMSPreflight"),

operatorClient: operatorClient,
apiServerClient: apiServerClient,
coreClient: coreClient,
operatorClient: operatorClient,
apiServerClient: apiServerClient,
secretsClient: secretsClient,
configMapsClient: configMapsClient,

deployer: deployer,
provider: provider,
Expand Down Expand Up @@ -709,7 +713,7 @@ func (c *kmsPreflightController) preflightRequired(ctx context.Context) (string,
if err != nil {
return "", nil, fmt.Errorf("failed to create KMS provider config: %w", err)
}
hasher, err := newKMSConfigHasher(providerCfg, newCoreClientKMSConfigHasherResourceProvider(c.coreClient), openshiftConfigNS)
hasher, err := newKMSConfigHasher(providerCfg, newCoreClientKMSConfigHasherResourceProvider(c.secretsClient, c.configMapsClient), openshiftConfigNS)
if err != nil {
return "", nil, fmt.Errorf("failed to create KMS config hasher: %w", err)
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/operator/encryption/controllers/kms_preflight_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func TestKMSConfigHasher(t *testing.T) {
}

client := fake.NewSimpleClientset(scenario.resources...).CoreV1()
hasher, err := newKMSConfigHasher(provider, newCoreClientKMSConfigHasherResourceProvider(client), "openshift-config")
hasher, err := newKMSConfigHasher(provider, newCoreClientKMSConfigHasherResourceProvider(client, client), "openshift-config")
if err != nil {
t.Fatalf("newKMSConfigHasher: %v", err)
}
Expand Down Expand Up @@ -1009,6 +1009,7 @@ func TestKMSPreflightController(t *testing.T) {
fakeApiServerClient,
fakeApiServerInformer,
fakeKubeClient.CoreV1(),
fakeKubeClient.CoreV1(),
scenario.encryptionStatusProvider,
eventRecorder,
)
Expand Down