Skip to content

Cherry pick #4981 Adding preliminary label fix for alloydbinstance.#4983

Closed
cheftako wants to merge 3 commits intoGoogleCloudPlatform:release-1.132from
cheftako:release-1.132
Closed

Cherry pick #4981 Adding preliminary label fix for alloydbinstance.#4983
cheftako wants to merge 3 commits intoGoogleCloudPlatform:release-1.132from
cheftako:release-1.132

Conversation

@cheftako
Copy link
Collaborator

Change description

Fixes issue where outside/kubernetes labels are being incorrectly applied to the AlloyDBInstance.
Added gemini generate command of making a sanitize label fix. Added the result of running the gemini generate command. This includes the fix and the initial test.

Special notes for your reviewer:

Does this PR add something which needs to be 'release noted'?

AlloyDBInstance fix for Kubernetes labels.
  • Reviewer reviewed release note.

Additional documentation e.g., references, usage docs, etc.:

NONE

Intended Milestone

1.132.2

Please indicate the intended milestone.

  • Reviewer tagged PR with the actual milestone.

Tests you have done

  • Run make ready-pr to ensure this PR is ready for review.
  • Perform necessary E2E testing for changed resources.

Added gemini generate command of making a sanitize label fix.
Added the result of running the gemini generate command.
This includes the fix and the initial test.
@cheftako
Copy link
Collaborator Author

/assign @justinsb @xiaoweim

@yuwenma
Copy link
Collaborator

yuwenma commented Aug 15, 2025

/approve

Non-blocker: Label is a generic issue that needs to be applied for all KCC resources (greenfield and brownfield). Suggest extending the label fixes to a broader scope. I would like to convert https://docs.google.com/document/d/1yBzlQmWbp5Q4B02pxe9kuegU9bp84A-cLotbEqzZgkg/edit?tab=t.0 to a gemini instruction or cmd.

@google-oss-prow
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: yuwenma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

if resource.Labels == nil {
resource.Labels = make(map[string]string)
}
resource.Labels["managed-by-cnrm"] = "true"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: with NewGCPLabelsFromK8sLabels this line is no longer needed. as well as line 261

@cheftako
Copy link
Collaborator Author

cheftako commented Sep 9, 2025

Closing in preference for making 1.134 the "stable" release

@cheftako cheftako closed this Sep 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants