Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(*) use go embed #1865

Merged
merged 3 commits into from
Apr 22, 2021
Merged

chore(*) use go embed #1865

merged 3 commits into from
Apr 22, 2021

Conversation

jakubdyszkiewicz
Copy link
Contributor

Summary

Use Go embed functionality available in Go 16, so we can finally forget about generate/* make targets.

The directory needs to be in the same module as //go:embed, so I had to create a new go module for HELM chart and also move GUI files to another location.

File paths in embed filesystem start without / as opposed to vsfiles.

deployments/fs.go Outdated Show resolved Hide resolved
@nickolaev
Copy link
Contributor

I hope we embed Envoy and CoreDNS in kuma-dp someday :)

@jakubdyszkiewicz jakubdyszkiewicz force-pushed the chore/go-16 branch 6 times, most recently from 891bd13 to ee44906 Compare April 22, 2021 09:48
Base automatically changed from chore/go-16 to master April 22, 2021 10:36
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@jakubdyszkiewicz jakubdyszkiewicz marked this pull request as ready for review April 22, 2021 11:29
@jakubdyszkiewicz jakubdyszkiewicz requested a review from a team as a code owner April 22, 2021 11:29
Copy link
Contributor

@bartsmykla bartsmykla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jakubdyszkiewicz jakubdyszkiewicz merged commit c6576a3 into master Apr 22, 2021
@jakubdyszkiewicz jakubdyszkiewicz deleted the embed branch April 22, 2021 13:11
mergify bot pushed a commit that referenced this pull request Apr 22, 2021
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
(cherry picked from commit c6576a3)

# Conflicts:
#	app/kuma-ui/data/resources/js/app.c6a62a81.js
#	app/kuma-ui/pkg/resources/data/js/app.c6a62a81.js
#	app/kuma-ui/pkg/resources/data/js/app.eef14a9f.js
#	app/kuma-ui/pkg/resources/guidir_vfsdata.go
#	app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
jakubdyszkiewicz pushed a commit that referenced this pull request Apr 22, 2021
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants