Switch to distroless consul-dataplane image with Envoy 1.24 #1676
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
boxofrad
commented
Nov 3, 2022
Comment on lines
356
to
360
| expArgs := []string{ | ||
| "-addresses 1.1.1.1 -grpc-port=8502 -proxy-service-id-path=/consul/connect-inject/proxyid-web " + | ||
| "-service-node-name=k8s-service-mesh -log-level=info -log-json=false -envoy-concurrency=0 -tls-disabled -envoy-admin-bind-port=19000 -- --base-id 0", | ||
| "-addresses 1.1.1.1 -grpc-port=8502 -proxy-service-id-path=/consul/connect-inject/proxyid-web-admin " + | ||
| "-service-node-name=k8s-service-mesh -log-level=info -log-json=false -envoy-concurrency=0 -tls-disabled -envoy-admin-bind-port=19001 -- --base-id 1", |
There was a problem hiding this comment.
Did this for expediency, but we should probably match on the Args slice rather than joining it into a string.
boxofrad
commented
Nov 3, 2022
charts/consul/values.yaml
Outdated
| @@ -572,7 +572,7 @@ global: | |||
| # The name (and tag) of the consul-dataplane Docker image used for the | |||
| # connect-injected sidecar proxies and mesh, terminating, and ingress gateways. | |||
| # @default: hashicorp/consul-dataplane:<latest supported version> | |||
| imageConsulDataplane: hashicorp/consul-dataplane:1.0.0-beta2 | |||
| imageConsulDataplane: duptonhashicorp/consul-dataplane:distroless-f7c2a05 | |||
There was a problem hiding this comment.
We need a "real" image 😅 (this one is from my laptop and has some extra debugging nonsense in)
added 5 commits
November 8, 2022 09:32
pglass
changed the title
ishustava
approved these changes
Nov 8, 2022
| @@ -33,6 +33,7 @@ func TestCreateOrUpdateACLPolicy_ErrorsIfDescriptionDoesNotMatch(t *testing.T) { | |||
| c.ACL.Tokens.InitialManagement = bootToken | |||
| }) | |||
| require.NoError(err) | |||
| defer svr.Stop() | |||
|
I merged the consul-dataplane change, so the latest |
pglass
reviewed
Nov 8, 2022
added 5 commits
November 9, 2022 15:15
This is needed for the distroless image that does not contain a shell.
pglass
reviewed
Nov 9, 2022
| - name: DP_CREDENTIAL_LOGIN_META1 | ||
| value: pod=$(NAMESPACE)/$(POD_NAME) | ||
| - name: DP_CREDENTIAL_LOGIN_META2 | ||
| value: component=ingress-gateway |
There was a problem hiding this comment.
Because there is no shell in the distroless image, we can't read environment variables within the command. Instead, we set env vars that consul-dataplane understands.
Depends on hashicorp/consul-dataplane#47
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:
This updates consul-k8s to use distroless images for consul-dataplane (hashicorp/consul-dataplane#15). This also updates Envoy to 1.24, and switches consul-dataplane commands to pass
-proxy-service-id-path.How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: