Fix reconciliation of user managed public IPs in flow #1052
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gardener-robot
added
area/quality
gardener-robot-ci-2
added
reviewed/ok-to-test
Comment on lines
544
to
584
| // TODO(hebelsan) remove in later release because we add the key when creating the object. | ||
| if _, ok := target.Tags[ManagedByGardenerTag]; !ok { | ||
| target.Tags[ManagedByGardenerTag] = to.Ptr("true") | ||
| } | ||
|
|
There was a problem hiding this comment.
I'd prefer a merge of target.Tags into base.Tags in l.541.
gardener-robot-ci-2
added
reviewed/ok-to-test
|
Tested migration from terraform to flow with customer managed public IP and shoot prefix name. |
|
@hebelsan You need rebase this pull request with latest master branch. Please check. |
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
|
Successfully tested that the public IP stays the same after switching to this controller version. |
gardener-robot
added
size/s
gardener-robot-ci-1
added
reviewed/ok-to-test
gardener-robot-ci-1
added
the
reviewed/ok-to-test
|
/test |
|
Testrun: e2e-qlb6r +---------------------+---------------------------+-----------+----------+ | NAME | STEP | PHASE | DURATION | +---------------------+---------------------------+-----------+----------+ | infrastructure-test | infrastructure-test | Succeeded | 27m38s | | infrastructure-test | infra-flow-test | Succeeded | 25m49s | | infrastructure-test | infra-flow-migration-test | Succeeded | 29m20s | | bastion-test | bastion-test | Succeeded | 13m35s | +---------------------+---------------------------+-----------+----------+ |
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
hebelsan
commented
Mar 3, 2025
| (address.Tags[azure.CCMServiceTagKey] == nil && address.Tags[azure.CCMLegacyServiceTagKey] == nil) | ||
| ptr.Deref(address.Tags[TagManagedByGardener], "") == "true" && | ||
| ptr.Deref(address.Tags[TagShootName], "") == fctx.adapter.TechnicalName() | ||
|
|
| @@ -424,6 +427,13 @@ func (fctx *FlowContext) ensurePublicIps(ctx context.Context) error { | |||
| // delete all the resources that are not in the list of target resources | |||
| pipCfg, ok := desiredConfiguration[name] | |||
| if !ok { | |||
| // skip deletion of IPs that may fit our criteria, but are referenced explicitly in the shoot spec. | |||
There was a problem hiding this comment.
Suggested change
| // skip deletion of IPs that may fit our criteria, but are referenced explicitly in the shoot spec. | |
| // skip deletion of IPs that may fit our criteria, but are referenced explicitly in the shoot spec. |
There was a problem hiding this comment.
Should be fixed with latest commit. PTAL :)
gardener-robot-ci-1
added
reviewed/ok-to-test
kon-angelo
approved these changes
Mar 4, 2025
| @@ -21,4 +21,7 @@ const ( | |||
| ChildKeyMigration = "migration" | |||
| // ChildKeyComplete is a key to indicate whether a task is complete. | |||
| ChildKeyComplete = "complete" | |||
|
|
|||
| // ManagedByGardenerTag is the tag used to mark resources managed by Gardener. | |||
| ManagedByGardenerTag = "managedByGardener" | |||
There was a problem hiding this comment.
Following CCM standards we could use kebab-case instead.
| @@ -424,6 +427,13 @@ func (fctx *FlowContext) ensurePublicIps(ctx context.Context) error { | |||
| // delete all the resources that are not in the list of target resources | |||
| pipCfg, ok := desiredConfiguration[name] | |||
| if !ok { | |||
| // skip deletion of IPs that may fit our criteria, but are referenced explicitly in the shoot spec. | |||
There was a problem hiding this comment.
Should be fixed with latest commit. PTAL :)
gardener-robot
added
reviewed/lgtm
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot
added
the
status/closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How to categorize this PR?
/area quality
/kind bug
/platform azure
What this PR does / why we need it:
This PR prevents the deletion of certain user managed public IPs during flow reconciliation after Terraform migration.
It adds a tag to IPs that reside in the shoot namespace and have the shoot prefix but should not be touched by us.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Release note: