fix: Set GCPMachinepoolMachine.Status.LatestModelApplied to false if some labels applied to node are not same as expected #25
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
…odelApplied to false if additionalLabels attached to node is not the same as ones set in gcpmachinepool.spec.additionallabels
cloud/scope/machinepoolmachine.go
Outdated
| func (m *MachinePoolMachineScope) HasLatestModelApplied(_ context.Context, instance *compute.Disk) (bool, error) { | ||
| func (m *MachinePoolMachineScope) HasLatestModelApplied(ctx context.Context, instance *compute.Disk, labels map[string]string) (bool, error) { | ||
| log := log.FromContext(ctx) | ||
|
|
||
| image := "" |
There was a problem hiding this comment.
I wonder if an explicit var declaration will help with the check failure.
There was a problem hiding this comment.
added a change, please check
| log.Error(err, "Error checking the AdditonalLabels") | ||
| return false, err | ||
| } | ||
| if image == instanceImage && hasAdditionalLabelsDiff { |
There was a problem hiding this comment.
I think the name hasAdditionalLabelsDiff is a bit confusing here. Ideally it should mean doesNotHaveAdditionalLabelsDiff or noAdditionalLabelsDiff in the above context, correct?
There was a problem hiding this comment.
just added a change here 761d5d7, please check
| return false, nil | ||
| } | ||
|
|
||
| // hasAdditionalLabelsDiff Checks if the Labels applied to the instance are the latest as in the Instance Template. | ||
| // two keys of `capg-role` and `capg-cluster-<CLUSTER-NAME>` as they are added by default by CAPG | ||
| // ref: https://github.com/newrelic-forks/cluster-api-provider-gcp/blob/ef2e7f1e64ebeeb5389c446fe4cf89026fcb8a8a/cloud/services/compute/instances/reconcile_test.go#L244-L24 |
There was a problem hiding this comment.
Could you please add a one-liner to say we need to ignore the 2 labels?
There was a problem hiding this comment.
just added a change here 761d5d7, please check
lint is passing. https://github.com/newrelic-forks/cluster-api-provider-gcp/actions/runs/9715896835/job/26818326647?pr=25 |
sachin-shankar
approved these changes
Jul 2, 2024
|
@tasdikrahman go ahead and reopen this |
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.
instancegroupinstances: set
gcpmachinepoolmachine.status.LatestModelAppliedtofalseif additionalLabels attached to node is not the same as ones set ingcpmachinepool.spec.additionallabelsWhich would mark it for cleanup in graceful way ifcluster.x-k8s.io/replicas-managed-by: "true"is not present on theMachinePool, and the flow of https://github.com/newrelic-forks/cluster-api-provider-gcp/blob/v1.6.0-nr5/cloud/scope/machinepool.go#L278 would be called.What type of PR is this?
/kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Special notes for your reviewer:
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
TODOs:
Release note: