All creation of metadata and tags from k8s annotations #141
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
|
@nicholasjackson I've taken #135 and
Please review. @ishustava can you review as well please. |
nicholasjackson
approved these changes
Oct 4, 2019
…ired for service-resolver. Note: tests were passing as this data is set on the service
- add back support for the old tags annotation but mark as deprecated - add tests that check more of the template rendering - fix bug where the -default-protocol flag wasn't being used - clean up whitespace in rendered init container script
lkysow
force-pushed
the
service-annotations
branch
from
ae60cae
to
fa7ecc5
Compare
2 tasks
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.
Adding one commit to #135 that:
Original PR description:
This PR is a roll up of previous PRs as I found a bug. The original code was not setting the tags and service metadata for the proxy. While the tests were passing for this as the test only searches for the existence of tags in the command. Since this data was present on the service config the test passed however for Consul L7 config tags and metadata need to be present on the proxy.
Content:
Add annotation to allow the configuration of service tags in Consul
consul.hashicorp.com/service-tags, value is a comma separated string of tags to add to the service
Add annotation to allow the configuration of service metadata in Consul service catalog
consul.hashicorp.com/service-meta- individual annotations are specified with the metadata key in the annotation name. Key is the name of the metadata key to store in the Consul service catalog. Value of the annotation is the value set against the metadata.
A test docker container for this branch can be found at nicholasjackson/consul-k8s-dev:beta
Fixes #112