SpannerBackupSchedule: Migrate KMSCryptoKeyRef to kmsv1beta1 and normalize references #13614

Overview

Migrate KMS key reference(s) from the legacy unstructured refs.KMSCryptoKeyRef (apis/refs/v1beta1.KMSCryptoKeyRef) to the typed kmsv1beta1.KMSCryptoKeyRef (apis/kms/v1beta1.KMSCryptoKeyRef), and ensure common.NormalizeReferences is called during controller reconciliation.

Problem Description

1. Missing refs.Ref interface implementation:
   The current API definitions in apis/spanner/v1beta1/spannerbackupschedule_types.go and apis/spanner/v1alpha1/spannerbackupschedule_types.go use *refs.KMSCryptoKeyRef for spec.encryptionConfig.kmsKeyRef and []*refs.KMSCryptoKeyRef for spec.encryptionConfig.kmsKeyRefs. These legacy reference types do not implement the refs.Ref interface and cannot be automatically resolved by KCC's reference normalization mechanism.

2. Missing reference normalization in controller:
   In pkg/controller/direct/spanner/spannerbackupschedule_controller.go, AdapterForObject does not invoke common.NormalizeReferences(ctx, reader, obj, nil). As a result, references configured via name or namespace (instead of explicit external string) are not resolved to their canonical GCP external format before constructing desired GCP API protos, leading to reconciliation errors or diff discrepancies.

Proposed Changes

1. Update API Types:

   • In apis/spanner/v1beta1/spannerbackupschedule_types.go and apis/spanner/v1alpha1/spannerbackupschedule_types.go:
     • Import kmsv1beta1 "github.com/GoogleCloudPlatform/k8s-config-connector/apis/kms/v1beta1".
     • Change field KMSKeyRef from *refs.KMSCryptoKeyRef to *kmsv1beta1.KMSCryptoKeyRef.
     • Change field KMSKeyRefs from []*refs.KMSCryptoKeyRef to []*kmsv1beta1.KMSCryptoKeyRef.

2. Update Direct Controller:

   • In pkg/controller/direct/spanner/spannerbackupschedule_controller.go:
     • In AdapterForObject, invoke common.NormalizeReferences(ctx, reader, obj, nil) after converting from unstructured and before building the identity/client.

3. Regenerate Code & CRDs:

   • Run dev/tasks/generate-types-and-mappers (and make fmt).

4. Testing:

   • Verify existing tests pass and add/update test cases referencing KMS keys to ensure reference resolution works as expected.

Affected Files & Fields

• Resource: SpannerBackupSchedule (spanner.cnrm.cloud.google.com/v1beta1 & v1alpha1)
• API Types File: apis/spanner/v1beta1/spannerbackupschedule_types.go, apis/spanner/v1alpha1/spannerbackupschedule_types.go
• Controller File: pkg/controller/direct/spanner/spannerbackupschedule_controller.go
• Spec Field(s): spec.encryptionConfig.kmsKeyRef, spec.encryptionConfig.kmsKeyRefs