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.

Sign up for GitHub

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

make NSTemplateTier generator generic & move to common #1006

Merged
merged 7 commits into from
Apr 18, 2024
Merged

make NSTemplateTier generator generic & move to common #1006

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b005cd7
make NSTemplateTier generator generic & move to common
MatousJobanek Apr 3, 2024
b39bddd
metadata
MatousJobanek Apr 3, 2024
fd32166
Merge branch 'master' into make-nstemplatetier-generator-generic
MatousJobanek Apr 12, 2024
ca35c0d
update dependency
MatousJobanek Apr 17, 2024
bc11d82
fix test
MatousJobanek Apr 17, 2024
dbd9730
update common & fix flaky tests 2.0
MatousJobanek Apr 17, 2024
07deb94
Merge branch 'master' into make-nstemplatetier-generator-generic
MatousJobanek Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controllers/usersignup/usersignup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ require (
github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9
github.com/codeready-toolchain/toolchain-common v0.0.0-20240403070054-183e7d407080
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
Expand Down Expand Up @@ -33,6 +32,8 @@ require (

require github.com/google/uuid v1.3.0 // indirect

replace github.com/codeready-toolchain/toolchain-common => github.com/matousjobanek/toolchain-common v0.0.0-20240403103433-189935dc05ef

require (
cloud.google.com/go v0.97.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9 h1:Lm7bFLrzfJzrUiRGVqtsSaZMpj+akLiR/fvAFjjE9gM=
github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9/go.mod h1:cfNN6YPX4TORvhhZXMSjSPesqAHlB3nD/WAfGe4WLKQ=
github.com/codeready-toolchain/toolchain-common v0.0.0-20240403070054-183e7d407080 h1:2ZzjVjiEbQmJoLrGfY4A4VH4MEkYj030aZ1gnDUhLgs=
github.com/codeready-toolchain/toolchain-common v0.0.0-20240403070054-183e7d407080/go.mod h1:OJ3L9aaTRMGjxr2WeH/9l6m5OjExwEK3Bp/+P+efoGg=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
Expand Down Expand Up @@ -432,6 +430,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/matousjobanek/toolchain-common v0.0.0-20240403103433-189935dc05ef h1:MIWToDWnd6pFAhdmAEedy1pYBZhlj3lPTI9aPqEDzLM=
github.com/matousjobanek/toolchain-common v0.0.0-20240403103433-189935dc05ef/go.mod h1:Iat3N+zBZcVgm/HWxa/ltSEoelM/YCXQUvbL9C8OSTw=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
Expand Down
4 changes: 0 additions & 4 deletions make/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading