server: add per-service annotations for main and internal services#1179
Open
mbaldessari wants to merge 1 commit intohashicorp:mainfrom
Open
server: add per-service annotations for main and internal services#1179mbaldessari wants to merge 1 commit intohashicorp:mainfrom
mbaldessari wants to merge 1 commit intohashicorp:mainfrom
Conversation
PR hashicorp#896 added per-service annotation support for the HA active and standby services (server.service.active.annotations and server.service.standby.annotations), partially addressing issue hashicorp#674. However, it left out two services that still only received the generic server.service.annotations: - The main service (server-service.yaml): the primary client-facing service, rendered in every deployment mode (standalone, dev, and HA). - The internal headless service (server-headless-service.yaml): the ClusterIP=None service used for pod DNS and Raft join operations. Without per-service annotations on these two services, setting server.service.annotations applies to *all* four services. This makes it impossible to, for example, set different annotations on the main service versus the internal headless service which is the problem that was described in issue 674 and which I am hitting as well. This commit adds: - server.service.main.annotations: annotations applied only to the main service (server-service.yaml), merged after (and overriding) the generic server.service.annotations. - server.service.internal.annotations: annotations applied only to the internal headless service (server-headless-service.yaml), with the same merge/override semantics. "main" was chosen over "nonha" because this service is rendered in all deployment modes, not just non-HA. Closes: hashicorp#647 Signed-off-by: Michele Baldessari <michele@acksyn.org>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
PR #896 added per-service annotation support for the HA active and standby services (server.service.active.annotations and server.service.standby.annotations), partially addressing issue #674. However, it left out two services that still only received the generic server.service.annotations:
Without per-service annotations on these two services, setting server.service.annotations applies to all four services. This makes it impossible to, for example, set different annotations on the main service versus the internal headless service which is the problem that was described in issue 674 and which I am hitting as well.
This commit adds:
"main" was chosen over "nonha" because this service is rendered in all deployment modes, not just non-HA.
Closes: #647
PCI review checklist
I have documented a clear reason for, and description of, the change I am making.
If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.
If applicable, I've documented the impact of any changes to security controls.
Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.