feat: added configuration for TLS enabled hydra admin services #636
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
dwilson1988
changed the title
Demonsthere
requested changes
Aug 24, 2023
* move defaults to values.yaml * add test volume/volumeMounts
Thanks for the review! I've made the requested changes, let me know if there's anything else you'd like me to change! |
Demonsthere
approved these changes
Aug 24, 2023
| @@ -32,6 +32,12 @@ adminService: | |||
| # -- Set the clients endpoint, should be `/clients` for Hydra 1.x and | |||
| # `/admin/clients` for Hydra 2.x | |||
| endpoint: /admin/clients | |||
| # -- Scheme used by Hydra client endpoint. May be "http" or "https" | |||
There was a problem hiding this comment.
nit: we also could use fail and an if in the code to verify if the scheme is http or https, but on the other hand it is the users responsibility to provide sane overrides 🤔
There was a problem hiding this comment.
added a little block to the top of deployment.yaml. Hopefully this works for you?
| @@ -48,7 +52,7 @@ spec: | |||
| - /manager | |||
| args: | |||
| - --metrics-addr=127.0.0.1:8080 | |||
| - --hydra-url=http://{{ .Values.adminService.name | default ( include "hydra-maester.adminService" . ) }} | |||
| - --hydra-url={{ .Values.adminService.scheme }}://{{ .Values.adminService.name | default ( include "hydra-maester.adminService" . ) }} | |||
| - --hydra-port={{ .Values.adminService.port | default 4445 }} | |||
There was a problem hiding this comment.
i just noticed this, could you move the port to values.yaml too?
For name we leave it empty as we want to compute the field
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 pull request adds the ability to configure hydra-maester to point to a hydra admin endpoint that has TLS enabled. Previous to this PR, "http" was hard-coded in the admin host, causing HTTP 400 responses when talking to a hydra admin endpoint with TLS enabled. Furthermore, this PR adds the ability to add volume/volumeMounts to the deployment to add CA certs.
This simply adds in a few missing command line options from hydra-maester.
Checklist
If this pull request addresses a security vulnerability,
I confirm that I got approval (please contact security@ory.sh) from the maintainers to push the changes.