Use metadata field from configEntry #343
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
thisisnotashwin
requested review from
lkysow,
a team and
kschoche
and removed request for
a team
lkysow
reviewed
Sep 30, 2020
thisisnotashwin
force-pushed
the
refactor-ent-controller-tests
branch
from
bf0c6c8 to
a0c74d7
Compare
thisisnotashwin
force-pushed
the
add-metadata-to-crds
branch
from
a3f2400 to
bb6fae3
Compare
Base automatically changed from
refactor-ent-controller-tests
to
crd-controller-base
September 30, 2020 18:51
thisisnotashwin
force-pushed
the
add-metadata-to-crds
branch
from
bb6fae3 to
27c54d0
Compare
lkysow
approved these changes
Sep 30, 2020
thisisnotashwin
force-pushed
the
add-metadata-to-crds
branch
from
93279e0 to
9848109
Compare
lkysow
reviewed
Oct 1, 2020
controller/configentry_controller.go
Outdated
Comment on lines
114
to
120
| entry, _, err := r.ConsulClient.ConfigEntries().Get(configEntry.ConsulKind(), configEntry.Name(), &capi.QueryOptions{ | ||
| Namespace: r.consulNamespace(req.Namespace, configEntry.ConsulNamespaced()), | ||
| }) | ||
|
|
||
| if err != nil { | ||
| return ctrl.Result{}, fmt.Errorf("deleting config entry from consul: %w", err) | ||
| return ctrl.Result{}, fmt.Errorf("getting config entry from consul: %w", err) | ||
| } |
There was a problem hiding this comment.
So this shouldn't actually error out since if it is deleted then it's actually good.
There was a problem hiding this comment.
Nice catch. Updated this check to ignore notFound errors (I'm time traveling. Ignore timestamps.)
There was a problem hiding this comment.
Thanks for helping with finding the bug BTW. I really appreciate it.
- This ensures we dont have to necessarily write failing tests every time we add a field
…ed in external cluster
- Add error message in logs if Consul entry isnt deleted. - Extract private method to share meta across resources.
Co-authored-by: Luke Kysow <1034429+lkysow@users.noreply.github.com>
thisisnotashwin
force-pushed
the
add-metadata-to-crds
branch
from
9848109 to
ab7f4c3
Compare
thisisnotashwin
force-pushed
the
add-metadata-to-crds
branch
2 times, most recently
from
82d8c9a to
cefc24e
Compare
lkysow
approved these changes
Oct 1, 2020
controller/configentry_controller.go
Outdated
Comment on lines
125
to
126
| // Our finalizer is present, so we need to delete the config entry | ||
| // from consul. |
There was a problem hiding this comment.
Can probably drop this comment. Doesn't make much sense here since we're so deep into the deletion process here.
thisisnotashwin
force-pushed
the
add-metadata-to-crds
branch
from
cefc24e to
ede9b38
Compare
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.
This will determine if the resource is managed from outside the current cluster
Changes proposed in this PR:
datacenterthat is a required flag for the controller for startup. This string will be used in the meta() field of the config entries managed by ConsulThis field will be ignore when checking for equality between resources with
cmp.Equal().How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: