Refactor proxy injection to use Helm charts #3200
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
(This replaces #3195 that had some branch issues) Fixes #3128 A new chart `/charts/patch` was created, that generates the JSON patch payload that is to be returned to the k8s API when doing the injection through the proxy injector, and it's also leveraged by the `linkerd inject --manual` CLI. The VFS was used by `linkerd install` to access the old chart under `/chart`. Now the proxy injection also uses the Helm charts to generate the JSON patch (see above) so we've moved the VFS from `cli/static` to a new common place under `/pkg/charts/static`, and the new root for the VFS is now `/charts`. `linkerd install` hasn't yet migrated to use the new charts (that'll happen in #3127), so the only change in that regard was the creation of `/charts/chart` which is a symlink pointing to `/chart` that `install.go` now uses, so that the VFS contains both the old and new charts, as a temporary measure. You can see that `/bin/Dockerfile-bin`, `/controller/Dockerfile` and `/bin/build-cli-bin` do now `go generate` pointing to the new location (and the `go generate` annotation was moved from `/cli/main.go` to `pkg/charts/static/templates.go`). The symlink trick doesn't work when building the binaries through Docker, so `/bin/Dockerfile-bin` replaces the symlink with an actual copy of `/chart`. Also note that in `/controller/Dockerfile` we now need to include the `prod` tag in `go install` like we do in `/bin/Dockerfile-bin` so that the proxy injector does use the VFS instead of the local file system. - The common logic to parse a chart has been moved from `install.go` to `/pkg/charts/util.go`. - The special ENV var in the proxy for "outbound router capacity" that only applies to the Prometheus pod is now handled directly in the proxy partial and all the associated go code could be removed. - The `patch.go` lib for generating the JSON patch in go along with its tests `patch_test.go` are no longer needed. - Lots of functions in `/pkg/inject/inject.go` got removed/simplified with their logic being moved into the charts themselves. As a consequence lots of things in `inject_test.go` became irrelevant. - Moved `template-values.go` from `/pkg/inject` to `pkg/charts` as that contains the go structs representation of the chart variables that will be leveraged in #3127. Don't forget to run `/bin/helm.sh` whenever you make changes to charts ;-) Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
|
Integration test results for 4e4ab8c: success 🎉 |
Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
|
Integration test results for 0bee203: fail 😕 |
ihcsim
reviewed
Aug 6, 2019
Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
|
Integration test results for 199b602: success 🎉 |
siggy
approved these changes
Aug 7, 2019
…bled Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
|
Integration test results for 04085cd: success 🎉 |
ihcsim
reviewed
Aug 7, 2019
Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
|
Integration test results for 7908e1a: fail 😕 |
Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
|
Integration test results for 9d29eeb: success 🎉 |
This was referenced Aug 10, 2019
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 replaces #3195 that had some branch issues)
Fixes #3128
New
patchchartA new chart
/charts/patchwas created, that generates the JSON patchpayload that is to be returned to the k8s API when doing the injection
through the proxy injector, and it's also leveraged by the
linkerd inject --manualCLI.Virtual File System changes
The VFS was used by
linkerd installto access the old chart under/chart. Now the proxy injection also uses the Helm charts to generatethe JSON patch (see above) so we've moved the VFS from
cli/staticto anew common place under
/pkg/charts/static, and the new root for the VFS isnow
/charts.linkerd installhasn't yet migrated to use the new charts (that'llhappen in #3127), so the only change in that regard was the creation of
/charts/chartwhich is a symlink pointing to/chartthatinstall.gonow uses, so that the VFS contains both the old and newcharts, as a temporary measure.
You can see that
/bin/Dockerfile-bin,/controller/Dockerfileand/bin/build-cli-bindo nowgo generatepointing to the new location(and the
go generateannotation was moved from/cli/main.gotopkg/charts/static/templates.go).The symlink trick doesn't work when building the binaries through
Docker, so
/bin/Dockerfile-binreplaces the symlink with an actualcopy of
/chart.Also note that in
/controller/Dockerfilewe now need to include theprodtag ingo installlike we do in/bin/Dockerfile-binso thatthe proxy injector does use the VFS instead of the local file system.
Other changes
install.goto/pkg/charts/util.go.only applies to the Prometheus pod is now handled directly in the proxy
partial and all the associated go code could be removed.
patch.golib for generating the JSON patch in go alongwith its tests
patch_test.goare no longer needed./pkg/inject/inject.gogot removed/simplifiedwith their logic being moved into the charts themselves. As a
consequence lots of things in
inject_test.gobecame irrelevant.template-values.gofrom/pkg/injecttopkg/chartsas thatcontains the go structs representation of the chart variables that
will be leveraged in Refactor CLI Install Command To Work With 2.5 Helm Chart #3127.
Testing
Don't forget to run
/bin/helm.shwhenever you make changes to charts;-)