make NSTemplateTier generator generic & move to common (#1006)

codeready-toolchain · Apr 18, 2024 · c0d5f3c · c0d5f3c
1 parent 8ea73da
commit c0d5f3c
Show file tree

Hide file tree

Showing 25 changed files with 167 additions and 2,364 deletions.
diff --git a/controllers/usersignup/usersignup_controller.go b/controllers/usersignup/usersignup_controller.go
@@ -380,6 +380,7 @@ func (r *Reconciler) checkIfMurAlreadyExists(
 		}
 
 		logger.Info("Setting UserSignup status to 'Complete'")
+
 		return true, r.updateStatus(ctx, userSignup, r.updateCompleteStatus(mur.Name))
 	}
 

diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ require (
 	github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9
 	github.com/codeready-toolchain/toolchain-common v0.0.0-20240417084737-d3c148491687
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/ghodss/yaml v1.0.0
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-logr/logr v1.2.3
 	github.com/gofrs/uuid v4.4.0+incompatible

diff --git a/make/go.mk b/make/go.mk
@@ -26,7 +26,6 @@ vendor:
 
 NSTEMPLATES_BASEDIR = deploy/templates/nstemplatetiers
 NSTEMPLATES_FILES = $(wildcard $(NSTEMPLATES_BASEDIR)/**/*.yaml)
-NSTEMPLATES_TEST_BASEDIR = test/templates/nstemplatetiers
 
 USERTEMPLATES_BASEDIR = deploy/templates/usertiers
 USERTEMPLATES_TEST_BASEDIR = test/templates/usertiers
@@ -57,9 +56,6 @@ generate-assets: go-bindata
 	@echo "generating bindata for files in $(NSTEMPLATES_BASEDIR) ..."
 	@rm ./pkg/templates/nstemplatetiers/nstemplatetier_assets.go 2>/dev/null || true
 	@$(GO_BINDATA) -pkg nstemplatetiers -o ./pkg/templates/nstemplatetiers/nstemplatetier_assets.go -nometadata -nocompress -prefix $(NSTEMPLATES_BASEDIR) $(NSTEMPLATES_BASEDIR)/...
-	@echo "generating bindata for files in $(NSTEMPLATES_TEST_BASEDIR) ..."
-	@rm ./test/templates/nstemplatetiers/nstemplatetier_assets.go 2>/dev/null || true
-	@$(GO_BINDATA) -pkg nstemplatetiers_test -o ./test/templates/nstemplatetiers/nstemplatetier_assets.go -nometadata -nocompress -prefix $(NSTEMPLATES_TEST_BASEDIR) -ignore doc.go $(NSTEMPLATES_TEST_BASEDIR)/...
 
 	@echo "generating bindata for files in $(USERTEMPLATES_BASEDIR) ..."
 	@rm ./pkg/templates/usertiers/usertier_assets.go 2>/dev/null || true