From 0a7fb8777451f69dbfc961ae2129aa35258de08c Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Tue, 18 Mar 2025 17:01:40 +0530 Subject: [PATCH 1/2] KUBESAW-201: Replace go-bindata with go:embed Signed-off-by: Feny Mehta --- deploy/resources.go | 3 +++ make/go.mk | 3 --- pkg/templates/registrationservice/template.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy/resources.go b/deploy/resources.go index 2923d8043..d68f4ccae 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -7,3 +7,6 @@ var NotificationTemplateFS embed.FS //go:embed templates/toolchaincluster/* var ToolchainClusterTemplateFS embed.FS + +//go:embed registration-service/* +var RegistrationServiceFS embed.FS diff --git a/make/go.mk b/make/go.mk index 4ae5ece4f..82df8c78b 100644 --- a/make/go.mk +++ b/make/go.mk @@ -64,9 +64,6 @@ generate-assets: go-bindata @rm ./test/templates/usertiers/usertier_assets.go 2>/dev/null || true @$(GO_BINDATA) -pkg usertiers_test -o ./test/templates/usertiers/usertier_assets.go -nometadata -nocompress -prefix $(USERTEMPLATES_TEST_BASEDIR) -ignore doc.go $(USERTEMPLATES_TEST_BASEDIR)/... - @echo "generating registration service template data..." - @$(GO_BINDATA) -pkg registrationservice -o ./pkg/templates/registrationservice/template_assets.go -nocompress -prefix $(REGISTRATION_SERVICE_DIR) $(REGISTRATION_SERVICE_DIR) - .PHONY: verify-dependencies ## Runs commands to verify after the updated dependecies of toolchain-common/API(go mod replace), if the repo needs any changes to be made verify-dependencies: tidy vet build test lint-go-code diff --git a/pkg/templates/registrationservice/template.go b/pkg/templates/registrationservice/template.go index 101ef9f73..2fd6a2783 100644 --- a/pkg/templates/registrationservice/template.go +++ b/pkg/templates/registrationservice/template.go @@ -1,6 +1,7 @@ package registrationservice import ( + "github.com/codeready-toolchain/host-operator/deploy" templatev1 "github.com/openshift/api/template/v1" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" @@ -13,7 +14,7 @@ const ResourceName = "registration-service" const ProxyRouteName = "api" func GetDeploymentTemplate() (*templatev1.Template, error) { - deployment, err := Asset("registration-service.yaml") + deployment, err := deploy.RegistrationServiceFS.ReadFile("registration-service/registration-service.yaml") if err != nil { return nil, err } From 33636499f5f4d0f0877c22d8e040cf3db5368eea Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 20 Mar 2025 12:36:04 +0530 Subject: [PATCH 2/2] moving rs under templates Signed-off-by: Feny Mehta --- deploy/resources.go | 2 +- .../registration-service/registration-service.yaml | 0 pkg/templates/registrationservice/template.go | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename deploy/{ => templates}/registration-service/registration-service.yaml (100%) diff --git a/deploy/resources.go b/deploy/resources.go index d68f4ccae..c49aabffb 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -8,5 +8,5 @@ var NotificationTemplateFS embed.FS //go:embed templates/toolchaincluster/* var ToolchainClusterTemplateFS embed.FS -//go:embed registration-service/* +//go:embed templates/registration-service/* var RegistrationServiceFS embed.FS diff --git a/deploy/registration-service/registration-service.yaml b/deploy/templates/registration-service/registration-service.yaml similarity index 100% rename from deploy/registration-service/registration-service.yaml rename to deploy/templates/registration-service/registration-service.yaml diff --git a/pkg/templates/registrationservice/template.go b/pkg/templates/registrationservice/template.go index 2fd6a2783..52e15c5d5 100644 --- a/pkg/templates/registrationservice/template.go +++ b/pkg/templates/registrationservice/template.go @@ -14,7 +14,7 @@ const ResourceName = "registration-service" const ProxyRouteName = "api" func GetDeploymentTemplate() (*templatev1.Template, error) { - deployment, err := deploy.RegistrationServiceFS.ReadFile("registration-service/registration-service.yaml") + deployment, err := deploy.RegistrationServiceFS.ReadFile("templates/registration-service/registration-service.yaml") if err != nil { return nil, err }