Add support for TransparentProxy.DialedDirectly #533
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
lkysow
force-pushed
the
lkysow/dialed-directly
branch
3 times, most recently
from
b7dfc08
to
8f0a394
Compare
lkysow
commented
Jun 14, 2021
| @@ -162,7 +162,7 @@ ifeq (, $(shell which controller-gen)) | |||
| CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\ | |||
| cd $$CONTROLLER_GEN_TMP_DIR ;\ | |||
| go mod init tmp ;\ | |||
| go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\ | |||
| go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.0 ;\ | |||
There was a problem hiding this comment.
This is the error I was getting:
make ctrl-manifests
/Users/lkysow/go/bin/controller-gen "crd:trivialVersions=true,allowDangerousTypes=true" rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
github.com/hashicorp/consul-k8s/api/v1alpha1:-: conflicting types in allOf branches in schema: string vs object
Error: not all generators ran successfully
run `controller-gen crd:trivialVersions=true,allowDangerousTypes=true rbac:roleName=manager-role webhook paths=./... output:crd:artifacts:config=config/crd/bases -w` to see all available markers, or `controller-gen crd:trivialVersions=true,allowDangerousTypes=true rbac:roleName=manager-role webhook paths=./... output:crd:artifacts:config=config/crd/bases -h` for usage
make: *** [ctrl-manifests] Error 1
| input *ProxyDefaults | ||
| expectedErrMsg string | ||
| }{ | ||
| "meshgateway.mode": { |
There was a problem hiding this comment.
these cases are copied from servicedefaults where they share the same fields
thisisnotashwin
force-pushed
the
lkysow/dialed-directly
branch
from
9818f9d
to
9173c51
Compare
* renamed `types.go` => `shared_type.go` to better reflect what that file contains. * Added `DialedDirectly` field to `TransparentProxy` struct * Renamed `CatalogDestinationsOnly` to `MeshDestinationsOnly` to match Consul renaming (hashicorp/consul#10397) * Added tests to validate for ProxyDefaults since that config entry now has more fields. The validate methods were technically tested through ServiceDefaults tests but I added them to ProxyDefaults since they both rely on that shared validation. * Fixed validation for OutboundListenerPort so that it returned the port as the error rather than the entire TransparentProxy struct. * Updated Consul api package to latest * Updated controller-runtime to 0.6.0 because I was getting an error on 0.5.0. * Regenerated YAML CRDs
thisisnotashwin
force-pushed
the
lkysow/dialed-directly
branch
2 times, most recently
from
e779707
to
72edde4
Compare
thisisnotashwin
force-pushed
the
lkysow/dialed-directly
branch
2 times, most recently
from
5c0ebd7
to
b7a7d94
Compare
|
I did a |
thisisnotashwin
force-pushed
the
lkysow/dialed-directly
branch
from
b7a7d94
to
98ca3f1
Compare
ndhanushkodi
pushed a commit
to ndhanushkodi/consul-k8s
that referenced
this pull request
Jul 9, 2021
…s for the gateway deployment templates (hashicorp#533) * update resource settings for the gateways for lifecycle sidecar and init containers
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.
types.go=>shared_type.goto better reflect what thatfile contains.
DialedDirectlyfield toTransparentProxystructCatalogDestinationsOnlytoMeshDestinationsOnlyto matchConsul renaming (Rename CatalogDestinationsOnly consul#10397)
has more fields. The validate methods were technically tested through
ServiceDefaults tests but I added them to ProxyDefaults since they both
rely on that shared validation.
as the error rather than the entire TransparentProxy struct.
0.5.0.
How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: