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 (backport #1865) #1870

Merged
merged 1 commit into from
Apr 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 22, 2021

This is an automatic backport of pull request #1865 done by Mergify.

Cherry-pick of c6576a3 has failed:

On branch mergify/bp/release-1.1/pr-1865
Your branch is up to date with 'origin/release-1.1'.

You are currently cherry-picking commit c6576a3a6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   api/go.mod
	modified:   api/go.sum
	deleted:    app/kuma-ui/data/resources/js/app.eef14a9f.js
	renamed:    app/kuma-ui/data/resources/css/app.a14147f6.css -> app/kuma-ui/pkg/resources/data/css/app.a14147f6.css
	renamed:    app/kuma-ui/data/resources/css/chunk-6eab93d9.d469af8f.css -> app/kuma-ui/pkg/resources/data/css/chunk-6eab93d9.d469af8f.css
	renamed:    app/kuma-ui/data/resources/css/chunk-vendors.13589a7d.css -> app/kuma-ui/pkg/resources/data/css/chunk-vendors.13589a7d.css
	renamed:    app/kuma-ui/data/resources/css/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~diagnostics~fa~fc7af22e.f64db730.css -> app/kuma-ui/pkg/resources/data/css/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~diagnostics~fa~fc7af22e.f64db730.css
	renamed:    app/kuma-ui/data/resources/css/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~fault-injectio~8f48d2fb.a9a801ba.css -> app/kuma-ui/pkg/resources/data/css/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~fault-injectio~8f48d2fb.a9a801ba.css
	renamed:    app/kuma-ui/data/resources/css/dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard.7016c940.css -> app/kuma-ui/pkg/resources/data/css/dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard.7016c940.css
	renamed:    app/kuma-ui/data/resources/css/diagnostics.ab64c3c5.css -> app/kuma-ui/pkg/resources/data/css/diagnostics.ab64c3c5.css
	renamed:    app/kuma-ui/data/resources/css/global-overview.0d1c7022.css -> app/kuma-ui/pkg/resources/data/css/global-overview.0d1c7022.css
	renamed:    app/kuma-ui/data/resources/css/meshes.65825788.css -> app/kuma-ui/pkg/resources/data/css/meshes.65825788.css
	renamed:    app/kuma-ui/data/resources/css/onboarding-complete.ec99487c.css -> app/kuma-ui/pkg/resources/data/css/onboarding-complete.ec99487c.css
	renamed:    app/kuma-ui/data/resources/css/onboarding-get-started.39d55f78.css -> app/kuma-ui/pkg/resources/data/css/onboarding-get-started.39d55f78.css
	renamed:    app/kuma-ui/data/resources/css/shell-default.ef087ed4.css -> app/kuma-ui/pkg/resources/data/css/shell-default.ef087ed4.css
	renamed:    app/kuma-ui/data/resources/css/traffic-permissions.48ddb8bd.css -> app/kuma-ui/pkg/resources/data/css/traffic-permissions.48ddb8bd.css
	renamed:    app/kuma-ui/data/resources/css/wizard-dataplane-kubernetes.9b1c72d9.css -> app/kuma-ui/pkg/resources/data/css/wizard-dataplane-kubernetes.9b1c72d9.css
	renamed:    app/kuma-ui/data/resources/css/wizard-dataplane-kubernetes~wizard-dataplane-universal~wizard-mesh.837ce40c.css -> app/kuma-ui/pkg/resources/data/css/wizard-dataplane-kubernetes~wizard-dataplane-universal~wizard-mesh.837ce40c.css
	renamed:    app/kuma-ui/data/resources/css/wizard-dataplane-universal.dcaacf12.css -> app/kuma-ui/pkg/resources/data/css/wizard-dataplane-universal.dcaacf12.css
	renamed:    app/kuma-ui/data/resources/css/wizard-mesh.e0b72f0c.css -> app/kuma-ui/pkg/resources/data/css/wizard-mesh.e0b72f0c.css
	renamed:    app/kuma-ui/data/resources/css/zones.29fcf91e.css -> app/kuma-ui/pkg/resources/data/css/zones.29fcf91e.css
	renamed:    app/kuma-ui/data/resources/favicon.png -> app/kuma-ui/pkg/resources/data/favicon.png
	renamed:    app/kuma-ui/data/resources/fonts/MaterialIcons-Regular.012cf6a1.woff -> app/kuma-ui/pkg/resources/data/fonts/MaterialIcons-Regular.012cf6a1.woff
	renamed:    app/kuma-ui/data/resources/fonts/MaterialIcons-Regular.570eb838.woff2 -> app/kuma-ui/pkg/resources/data/fonts/MaterialIcons-Regular.570eb838.woff2
	renamed:    app/kuma-ui/data/resources/fonts/MaterialIcons-Regular.a37b0c01.ttf -> app/kuma-ui/pkg/resources/data/fonts/MaterialIcons-Regular.a37b0c01.ttf
	renamed:    app/kuma-ui/data/resources/fonts/MaterialIcons-Regular.e79bfd88.eot -> app/kuma-ui/pkg/resources/data/fonts/MaterialIcons-Regular.e79bfd88.eot
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Black.59eb3601.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Black.59eb3601.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Black.8f766bb9.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Black.8f766bb9.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-BlackItalic.83b2c7d0.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-BlackItalic.83b2c7d0.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-BlackItalic.f75569f8.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-BlackItalic.f75569f8.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Bold.b52fac2b.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Bold.b52fac2b.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Bold.eb43b4c3.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Bold.eb43b4c3.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-BoldItalic.563c4bd6.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-BoldItalic.563c4bd6.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-BoldItalic.94008e69.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-BoldItalic.94008e69.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Italic.4357beb8.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Italic.4357beb8.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Italic.6521f388.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Italic.6521f388.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Light.c8405cfa.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Light.c8405cfa.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Light.d26871e8.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Light.d26871e8.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-LightItalic.e8eaae90.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-LightItalic.e8eaae90.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-LightItalic.f6dd13d5.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-LightItalic.f6dd13d5.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Medium.7b225d4d.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Medium.7b225d4d.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Medium.90d16760.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Medium.90d16760.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-MediumItalic.13ec0eb5.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-MediumItalic.13ec0eb5.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-MediumItalic.5df7f053.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-MediumItalic.5df7f053.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Regular.73f0a88b.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Regular.73f0a88b.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Regular.878ad715.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Regular.878ad715.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Thin.03fb3a93.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Thin.03fb3a93.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-Thin.ad538a69.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-Thin.ad538a69.woff2
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-ThinItalic.4ced2a97.woff -> app/kuma-ui/pkg/resources/data/fonts/Roboto-ThinItalic.4ced2a97.woff
	renamed:    app/kuma-ui/data/resources/fonts/Roboto-ThinItalic.5b4a33e1.woff2 -> app/kuma-ui/pkg/resources/data/fonts/Roboto-ThinItalic.5b4a33e1.woff2
	renamed:    app/kuma-ui/data/resources/fonts/RobotoMono-Bold.c0c4a337.ttf -> app/kuma-ui/pkg/resources/data/fonts/RobotoMono-Bold.c0c4a337.ttf
	renamed:    app/kuma-ui/data/resources/fonts/RobotoMono-Medium.5a45b286.ttf -> app/kuma-ui/pkg/resources/data/fonts/RobotoMono-Medium.5a45b286.ttf
	renamed:    app/kuma-ui/data/resources/fonts/RobotoMono-Regular.a48ac416.ttf -> app/kuma-ui/pkg/resources/data/fonts/RobotoMono-Regular.a48ac416.ttf
	renamed:    app/kuma-ui/data/resources/img/icon-k8s.fb248510.png -> app/kuma-ui/pkg/resources/data/img/icon-k8s.fb248510.png
	renamed:    app/kuma-ui/data/resources/img/icons/android-chrome-192x192.png -> app/kuma-ui/pkg/resources/data/img/icons/android-chrome-192x192.png
	renamed:    app/kuma-ui/data/resources/img/icons/android-chrome-512x512.png -> app/kuma-ui/pkg/resources/data/img/icons/android-chrome-512x512.png
	renamed:    app/kuma-ui/data/resources/img/icons/apple-touch-icon-120x120.png -> app/kuma-ui/pkg/resources/data/img/icons/apple-touch-icon-120x120.png
	renamed:    app/kuma-ui/data/resources/img/icons/apple-touch-icon-152x152.png -> app/kuma-ui/pkg/resources/data/img/icons/apple-touch-icon-152x152.png
	renamed:    app/kuma-ui/data/resources/img/icons/apple-touch-icon-180x180.png -> app/kuma-ui/pkg/resources/data/img/icons/apple-touch-icon-180x180.png
	renamed:    app/kuma-ui/data/resources/img/icons/apple-touch-icon-60x60.png -> app/kuma-ui/pkg/resources/data/img/icons/apple-touch-icon-60x60.png
	renamed:    app/kuma-ui/data/resources/img/icons/apple-touch-icon-76x76.png -> app/kuma-ui/pkg/resources/data/img/icons/apple-touch-icon-76x76.png
	renamed:    app/kuma-ui/data/resources/img/icons/apple-touch-icon.png -> app/kuma-ui/pkg/resources/data/img/icons/apple-touch-icon.png
	renamed:    app/kuma-ui/data/resources/img/icons/favicon-16x16.png -> app/kuma-ui/pkg/resources/data/img/icons/favicon-16x16.png
	renamed:    app/kuma-ui/data/resources/img/icons/favicon-32x32.png -> app/kuma-ui/pkg/resources/data/img/icons/favicon-32x32.png
	renamed:    app/kuma-ui/data/resources/img/icons/msapplication-icon-144x144.png -> app/kuma-ui/pkg/resources/data/img/icons/msapplication-icon-144x144.png
	renamed:    app/kuma-ui/data/resources/img/icons/mstile-150x150.png -> app/kuma-ui/pkg/resources/data/img/icons/mstile-150x150.png
	renamed:    app/kuma-ui/data/resources/img/icons/safari-pinned-tab.svg -> app/kuma-ui/pkg/resources/data/img/icons/safari-pinned-tab.svg
	renamed:    app/kuma-ui/data/resources/img/kubernetes-sidecar-injector.c807e521.png -> app/kuma-ui/pkg/resources/data/img/kubernetes-sidecar-injector.c807e521.png
	renamed:    app/kuma-ui/data/resources/img/kuma-loader-v1.07e0ca5d.gif -> app/kuma-ui/pkg/resources/data/img/kuma-loader-v1.07e0ca5d.gif
	renamed:    app/kuma-ui/data/resources/img/product-logo.5a8acea1.png -> app/kuma-ui/pkg/resources/data/img/product-logo.5a8acea1.png
	renamed:    app/kuma-ui/data/resources/img/upstream-tls.c90d2a66.png -> app/kuma-ui/pkg/resources/data/img/upstream-tls.c90d2a66.png
	renamed:    app/kuma-ui/data/resources/index.html -> app/kuma-ui/pkg/resources/data/index.html
	renamed:    app/kuma-ui/data/resources/js/canvg.js -> app/kuma-ui/pkg/resources/data/js/canvg.js
	renamed:    app/kuma-ui/data/resources/js/chunk-6eab93d9.js -> app/kuma-ui/pkg/resources/data/js/chunk-6eab93d9.js
	renamed:    app/kuma-ui/data/resources/js/chunk-vendors.js -> app/kuma-ui/pkg/resources/data/js/chunk-vendors.js
	renamed:    app/kuma-ui/data/resources/js/circuit-breakers.js -> app/kuma-ui/pkg/resources/data/js/circuit-breakers.js
	renamed:    app/kuma-ui/data/resources/js/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~diagnostics~fa~fc7af22e.js -> app/kuma-ui/pkg/resources/data/js/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~diagnostics~fa~fc7af22e.js
	renamed:    app/kuma-ui/data/resources/js/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~fault-injectio~8f48d2fb.js -> app/kuma-ui/pkg/resources/data/js/circuit-breakers~dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~fault-injectio~8f48d2fb.js
	renamed:    app/kuma-ui/data/resources/js/dataplanes-gateway.js -> app/kuma-ui/pkg/resources/data/js/dataplanes-gateway.js
	renamed:    app/kuma-ui/data/resources/js/dataplanes-ingress.js -> app/kuma-ui/pkg/resources/data/js/dataplanes-ingress.js
	renamed:    app/kuma-ui/data/resources/js/dataplanes-standard.js -> app/kuma-ui/pkg/resources/data/js/dataplanes-standard.js
	renamed:    app/kuma-ui/data/resources/js/dataplanes.js -> app/kuma-ui/pkg/resources/data/js/dataplanes.js
	renamed:    app/kuma-ui/data/resources/js/dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard.js -> app/kuma-ui/pkg/resources/data/js/dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard.js
	renamed:    app/kuma-ui/data/resources/js/dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~zones.js -> app/kuma-ui/pkg/resources/data/js/dataplanes~dataplanes-gateway~dataplanes-ingress~dataplanes-standard~zones.js
	renamed:    app/kuma-ui/data/resources/js/diagnostics.js -> app/kuma-ui/pkg/resources/data/js/diagnostics.js
	renamed:    app/kuma-ui/data/resources/js/fault-injections.js -> app/kuma-ui/pkg/resources/data/js/fault-injections.js
	renamed:    app/kuma-ui/data/resources/js/global-overview.js -> app/kuma-ui/pkg/resources/data/js/global-overview.js
	renamed:    app/kuma-ui/data/resources/js/health-checks.js -> app/kuma-ui/pkg/resources/data/js/health-checks.js
	renamed:    app/kuma-ui/data/resources/js/meshes.js -> app/kuma-ui/pkg/resources/data/js/meshes.js
	renamed:    app/kuma-ui/data/resources/js/not-found.js -> app/kuma-ui/pkg/resources/data/js/not-found.js
	renamed:    app/kuma-ui/data/resources/js/onboarding-complete.js -> app/kuma-ui/pkg/resources/data/js/onboarding-complete.js
	renamed:    app/kuma-ui/data/resources/js/onboarding-get-started.js -> app/kuma-ui/pkg/resources/data/js/onboarding-get-started.js
	renamed:    app/kuma-ui/data/resources/js/pdfmake.js -> app/kuma-ui/pkg/resources/data/js/pdfmake.js
	renamed:    app/kuma-ui/data/resources/js/proxy-templates.js -> app/kuma-ui/pkg/resources/data/js/proxy-templates.js
	renamed:    app/kuma-ui/data/resources/js/retries.js -> app/kuma-ui/pkg/resources/data/js/retries.js
	renamed:    app/kuma-ui/data/resources/js/shell-default.js -> app/kuma-ui/pkg/resources/data/js/shell-default.js
	renamed:    app/kuma-ui/data/resources/js/timeouts.js -> app/kuma-ui/pkg/resources/data/js/timeouts.js
	renamed:    app/kuma-ui/data/resources/js/traffic-logs.js -> app/kuma-ui/pkg/resources/data/js/traffic-logs.js
	renamed:    app/kuma-ui/data/resources/js/traffic-permissions.js -> app/kuma-ui/pkg/resources/data/js/traffic-permissions.js
	renamed:    app/kuma-ui/data/resources/js/traffic-routes.js -> app/kuma-ui/pkg/resources/data/js/traffic-routes.js
	renamed:    app/kuma-ui/data/resources/js/traffic-traces.js -> app/kuma-ui/pkg/resources/data/js/traffic-traces.js
	renamed:    app/kuma-ui/data/resources/js/wizard-dataplane-kubernetes.js -> app/kuma-ui/pkg/resources/data/js/wizard-dataplane-kubernetes.js
	renamed:    app/kuma-ui/data/resources/js/wizard-dataplane-kubernetes~wizard-dataplane-universal~wizard-mesh.js -> app/kuma-ui/pkg/resources/data/js/wizard-dataplane-kubernetes~wizard-dataplane-universal~wizard-mesh.js
	renamed:    app/kuma-ui/data/resources/js/wizard-dataplane-universal.js -> app/kuma-ui/pkg/resources/data/js/wizard-dataplane-universal.js
	renamed:    app/kuma-ui/data/resources/js/wizard-mesh.js -> app/kuma-ui/pkg/resources/data/js/wizard-mesh.js
	renamed:    app/kuma-ui/data/resources/js/xlsx.js -> app/kuma-ui/pkg/resources/data/js/xlsx.js
	renamed:    app/kuma-ui/data/resources/js/zones.js -> app/kuma-ui/pkg/resources/data/js/zones.js
	renamed:    app/kuma-ui/data/resources/manifest.json -> app/kuma-ui/pkg/resources/data/manifest.json
	renamed:    app/kuma-ui/data/resources/robots.txt -> app/kuma-ui/pkg/resources/data/robots.txt
	new file:   app/kuma-ui/pkg/resources/fs.go
	deleted:    app/kuma-ui/pkg/resources/guidir.go
	deleted:    app/kuma-ui/pkg/resources/guidir_dev.go
	deleted:    app/kuma-ui/pkg/resources/guidir_test.go
	deleted:    app/kuma-ui/pkg/resources/resources_suite_test.go
	modified:   app/kumactl/cmd/install/context/install_control_plane_context.go
	modified:   app/kumactl/cmd/install/context/install_crds_context.go
	modified:   app/kumactl/cmd/install/install_logging.go
	modified:   app/kumactl/cmd/install/install_metrics.go
	modified:   app/kumactl/cmd/install/install_tracing.go
	modified:   app/kumactl/cmd/install/render_helm_files.go
	new file:   app/kumactl/data/fs.go
	modified:   app/kumactl/pkg/install/data/files.go
	deleted:    app/kumactl/pkg/install/k8s/control-plane/control_plane_suite_test.go
	deleted:    app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata_test.go
	deleted:    app/kumactl/pkg/install/k8s/control-plane/templates.go
	deleted:    app/kumactl/pkg/install/k8s/control-plane/templates_dev.go
	deleted:    app/kumactl/pkg/install/k8s/logging/logging_suite_test.go
	deleted:    app/kumactl/pkg/install/k8s/logging/templates.go
	deleted:    app/kumactl/pkg/install/k8s/logging/templates_dev.go
	deleted:    app/kumactl/pkg/install/k8s/logging/templates_vfsdata.go
	deleted:    app/kumactl/pkg/install/k8s/logging/templates_vfsdata_test.go
	deleted:    app/kumactl/pkg/install/k8s/metrics/metrics_suite_test.go
	deleted:    app/kumactl/pkg/install/k8s/metrics/templates.go
	deleted:    app/kumactl/pkg/install/k8s/metrics/templates_dev.go
	deleted:    app/kumactl/pkg/install/k8s/metrics/templates_vfsdata.go
	deleted:    app/kumactl/pkg/install/k8s/metrics/templates_vfsdata_test.go
	deleted:    app/kumactl/pkg/install/k8s/tracing/templates.go
	deleted:    app/kumactl/pkg/install/k8s/tracing/templates_dev.go
	deleted:    app/kumactl/pkg/install/k8s/tracing/templates_vfsdata.go
	deleted:    app/kumactl/pkg/install/k8s/tracing/templates_vfsdata_test.go
	deleted:    app/kumactl/pkg/install/k8s/tracing/tracing_suite_test.go
	modified:   deployments/charts/kuma/README.md
	modified:   deployments/charts/kuma/README.md.gotmpl
	new file:   deployments/fs.go
	new file:   deployments/go.mod
	modified:   go.mod
	modified:   go.sum
	modified:   mk/generate.mk
	modified:   pkg/api-server/server.go
	modified:   pkg/api-server/server_gui_test.go
	modified:   pkg/plugins/resources/k8s/native/go.sum
	modified:   pkg/plugins/resources/postgres/migrate.go
	new file:   pkg/plugins/resources/postgres/migrations/fs.go
	deleted:    pkg/plugins/resources/postgres/migrations/migrations.go
	deleted:    pkg/plugins/resources/postgres/migrations/migrations_dev.go
	deleted:    pkg/plugins/resources/postgres/migrations/migrations_suite_test.go
	deleted:    pkg/plugins/resources/postgres/migrations/migrations_vfsdata.go
	deleted:    pkg/plugins/resources/postgres/migrations/migrations_vfsdata_test.go
	deleted:    pkg/test/vfsgen/files.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both deleted:    app/kuma-ui/data/resources/js/app.c6a62a81.js
	added by them:   app/kuma-ui/pkg/resources/data/js/app.c6a62a81.js
	added by us:     app/kuma-ui/pkg/resources/data/js/app.eef14a9f.js
	deleted by them: app/kuma-ui/pkg/resources/guidir_vfsdata.go
	deleted by them: app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

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
@mergify mergify bot requested a review from a team as a code owner April 22, 2021 13:12
@mergify mergify bot added the conflicts label Apr 22, 2021
@jakubdyszkiewicz jakubdyszkiewicz merged commit 704efe0 into release-1.1 Apr 22, 2021
@jakubdyszkiewicz jakubdyszkiewicz deleted the mergify/bp/release-1.1/pr-1865 branch April 22, 2021 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant