KUBESAW-273: Replace go-bindata with go:embed (codeready-toolchain#661)

* KUBESAW-201: Replace go-bindata with go:embed

Signed-off-by: Feny Mehta <fbm3307@gmail.com>

* some extra comitted files to be removed

Signed-off-by: Feny Mehta <fbm3307@gmail.com>

* CI happy

Signed-off-by: Feny Mehta <fbm3307@gmail.com>

* remove tools.go

Signed-off-by: Feny Mehta <fbm3307@gmail.com>

* review comments

Signed-off-by: Feny Mehta <fbm3307@gmail.com>

---------

Signed-off-by: Feny Mehta <fbm3307@gmail.com>

Author: fbm3307

.github/workflows/ci-golang-sbom.yml

@@ -22,10 +22,6 @@ jobs:
       with:
         go-version-file: go.mod
 
-    - name: Generate Assets
-      run: |
-        make generate-assets
-
     - name: Lint
       uses: golangci/golangci-lint-action@v7
       with:

.github/workflows/govulncheck.yml

@@ -18,10 +18,6 @@ jobs:
       with:
         go-version-file: go.mod
 
-    - name: Generate Assets
-      run: |
-        make generate-assets
-
     - name: Run govulncheck
       uses: golang/govulncheck-action@v1
       with:

.github/workflows/test-with-coverage.yml

@@ -26,10 +26,6 @@ jobs:
       uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
-
-    - name: Generate Assets
-      run: |
-        make generate-assets
 
     - name: Test
       run: |

.gitignore

@@ -83,9 +83,6 @@ out/
 
 tmp/
 
-# generated files
-*_assets.go
-
 # generated by either kubebuilder or operator-sdk
 config/rbac/role.yaml
 bundle/

deploy/resources.go

@@ -4,3 +4,9 @@ import "embed"
 
 //go:embed templates/toolchaincluster/*
 var ToolchainClusterTemplateFS embed.FS
+
+//go:embed templates/autoscaler/*
+var AutoScalerFS embed.FS
+
+//go:embed templates/webhook/*
+var WebhookFS embed.FS

…toscaler/member-operator-autoscaler.yaml …toscaler/member-operator-autoscaler.yamldeploy/autoscaler/member-operator-autoscaler.yaml renamed to deploy/templates/autoscaler/member-operator-autoscaler.yaml deploy/autoscaler/member-operator-autoscaler.yaml renamed to deploy/templates/autoscaler/member-operator-autoscaler.yaml

@@ -1,16 +1,11 @@
 # see go.mod
 CONTROLLER_GEN_VERSION=v0.15.0
 KUSTOMIZE_VERSION=v5.4.2
-GO_BINDATA_VERSION=v3.1.2
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
 	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,${CONTROLLER_GEN_VERSION})
 
-GO_BINDATA = $(shell pwd)/bin/go-bindata
-go-bindata: ## Download go-bindata locally if necessary.
-	$(call go-get-tool,$(GO_BINDATA),github.com/go-bindata/go-bindata/go-bindata,${GO_BINDATA_VERSION})
-
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5,$(KUSTOMIZE_VERSION))

…loy/webhook/member-operator-webhook.yaml …tes/webhook/member-operator-webhook.yamldeploy/webhook/member-operator-webhook.yaml renamed to deploy/templates/webhook/member-operator-webhook.yaml deploy/webhook/member-operator-webhook.yaml renamed to deploy/templates/webhook/member-operator-webhook.yaml

@@ -9,7 +9,7 @@ goarch ?= $(shell go env GOARCH)
 
 .PHONY: build
 ## Build the operator
-build: generate-assets $(OUT_DIR)/operator
+build: $(OUT_DIR)/operator
 
 $(OUT_DIR)/operator:
 	$(Q)CGO_ENABLED=0 GOARCH=${goarch} GOOS=linux \
@@ -27,15 +27,6 @@ $(OUT_DIR)/operator:
 vendor:
 	$(Q)go mod vendor
 
-.PHONY: generate-assets
-generate-assets: go-bindata
-	@echo "generating webhooks template data..."
-	@rm ./pkg/webhook/deploy/webhooks/template_assets.go 2>/dev/null || true
-	@$(GO_BINDATA) -pkg webhooks -o ./pkg/webhook/deploy/webhooks/template_assets.go -nocompress -prefix deploy/webhook deploy/webhook
-	@echo "generating autoscaler buffer template data..."
-	@rm ./pkg/autoscaler/template_assets.go 2>/dev/null || true
-	@$(GO_BINDATA) -pkg autoscaler -o ./pkg/autoscaler/template_assets.go -nocompress -prefix deploy/autoscaler deploy/autoscaler
-
 .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
@@ -48,6 +39,9 @@ tidy:
 vet:
 	go vet ./...
 
+.PHONY: generate-assets
+generate-assets:
+
 .PHONY: pre-verify
-pre-verify: generate-assets
+pre-verify: 
 	echo "Pre-requisite completed"

make/get-tool.mk

@@ -6,7 +6,7 @@
 
 .PHONY: test
 ## runs the tests without coverage and excluding E2E tests
-test: generate-assets 
+test: 
 	@echo "running the tests without coverage and excluding E2E tests..."
 	$(Q)go test ${V_FLAG} -race $(shell go list ./... | grep -v /test/e2e) -failfast
 
@@ -21,7 +21,7 @@ COV_DIR = $(OUT_DIR)/coverage
 
 .PHONY: test-with-coverage
 ## runs the tests with coverage
-test-with-coverage: generate-assets
+test-with-coverage: 
 	@echo "running the tests with coverage..."
 	@-mkdir -p $(COV_DIR)
 	@-rm $(COV_DIR)/coverage.txt