initial support for API Gateway #925
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
rrondeau
pushed a commit
to rrondeau/consul-k8s
that referenced
this pull request
Dec 21, 2021
nickethier
force-pushed
the
api-gateway/initial-support
branch
from
d41317c to
a85c585
Compare
ishustava
requested review from
a team,
kschoche and
ishustava
and removed request for
a team
ishustava
reviewed
Jan 20, 2022
charts/consul/templates/api-gateway-controller-clusterrole.yaml
Outdated
Show resolved
Hide resolved
| @@ -0,0 +1,147 @@ | |||
| {{- if (or (and (ne (.Values.apiGateway.enabled | toString) "-") .Values.apiGateway.enabled) (and (eq (.Values.apiGateway.enabled | toString) "-") .Values.global.enabled)) }} | |||
| {{- if not .Values.client.grpc }}{{ fail "client.grpc must be true for api gateway" }}{{ end }} | |||
| {{- if and .Values.global.adminPartitions.enabled (not .Values.global.enableConsulNamespaces) }}{{ fail "global.enableConsulNamespaces must be true if global.adminPartitions.enabled=true" }}{{ end }} | |||
There was a problem hiding this comment.
If the api gw has other prerequisites, it'd be good add those validations here.
Co-authored-by: Iryna Shustava <ishustava@users.noreply.github.com>
kschoche
reviewed
Jan 20, 2022
kschoche
reviewed
Jan 20, 2022
lkysow
reviewed
Jan 25, 2022
lkysow
reviewed
Jan 25, 2022
ishustava
reviewed
Jan 26, 2022
Comment on lines
23
to
33
| @test "apiGateway/Deployment: enable with global.enabled false, apiGateway.enabled true" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| -s templates/api-gateway-controller-deployment.yaml \ | ||
| --set 'global.enabled=false' \ | ||
| --set 'apiGateway.enabled=true' \ | ||
| --set 'apiGateway.image=foo' \ | ||
| . | tee /dev/stderr | | ||
| yq 'length > 0' | tee /dev/stderr) | ||
| [ "${actual}" = "true" ] | ||
| } |
There was a problem hiding this comment.
I think we don't need this test and disable with global.enabled since the api gw is no longer inheriting from the global.enabled
charts/consul/test/unit/api-gateway-controller-serviceaccount.bats
Outdated
Show resolved
Hide resolved
charts/consul/test/unit/api-gateway-controller-serviceaccount.bats
Outdated
Show resolved
Hide resolved
| # @type: string | ||
| logLevel: info | ||
|
|
||
| managedGatewayClass: |
There was a problem hiding this comment.
This one also needs docs
|
Thanks @ishustava. As far as acceptance test I had planned to follow up once we have release so there is a stable binary to reference from the test. |
Co-authored-by: Iryna Shustava <ishustava@users.noreply.github.com>
ishustava
approved these changes
Jan 26, 2022
thisisnotashwin
approved these changes
Jan 26, 2022
There was a problem hiding this comment.
Just a bunch of drive-by suggestions to sync this PR with #993
charts/consul/templates/api-gateway-controller-clusterrolebinding.yaml
Outdated
Show resolved
Hide resolved
charts/consul/templates/api-gateway-controller-clusterrolebinding.yaml
Outdated
Show resolved
Hide resolved
charts/consul/templates/api-gateway-controller-serviceaccount.yaml
Outdated
Show resolved
Hide resolved
Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com>
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.
Changes proposed in this PR:
How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: