FIX: Annotate and Label existing DNSEndpoints #443
Merged
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
k0da
requested review from
donovanmuller,
kuritka,
somaritane and
ytsarev
as code owners
ytsarev
requested changes
Apr 14, 2021
controllers/gslb_controller_test.go
Outdated
| reconcileAndUpdateGslb(t, settings) | ||
| err = settings.client.Get(context.TODO(), settings.request.NamespacedName, dnsEndpoint) | ||
| require.NoError(t, err, "Failed to load DNS endpoint") | ||
| got := dnsEndpoint.Annotations["k8gb.absa.oss/dnstype"] | ||
|
|
||
| // assert | ||
| assert.Equal(t, got, want, "got:\n %q annotation value,\n\n want:\n %q", got, want, got, want) | ||
| assert.Equal(t, want, got, "got:\n %q annotation value,\n\n want:\n %q", got, want, got, want) |
There was a problem hiding this comment.
Suggested change
| assert.Equal(t, want, got, "got:\n %q annotation value,\n\n want:\n %q", got, want, got, want) | |
| assert.Equal(t, want, got, "got:\n %q annotation value,\n\n want:\n %q", got, want) |
There was a problem hiding this comment.
@ytsarev thanks, amended
When upgrading from 0.7.5 to 0.7.6 new generated objectmeta wasn't concidered during DNSEndpoint reconcilation. Fix this by respecting computed Labels and Annotations while reconciling DNSEndpoint. Signed-off-by: Dinar Valeev <dinar.valeev@absa.africa>
ytsarev
approved these changes
Apr 15, 2021
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.
When upgrading from 0.7.5 to 0.7.6 new generated objectmeta wasn't
concidered during DNSEndpoint reconcilation. Fix this by respecting
computed Labels and Annotations while reconciling DNSEndpoint.
fixes https://github.com/AbsaOSS/k8gb/issues/324
Signed-off-by: Dinar Valeev dinar.valeev@absa.africa