From 03e447cc2d2ceabbb5f1ec1233d4d20ee68dca0d Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Thu, 1 Aug 2024 10:08:47 +0200 Subject: [PATCH 1/5] remove webConsolePlugin from ToolchainClusterConfig (go mod) Pendo has been decommisioned, we don't need this plugin anymore testing for host-operator: https://github.com/codeready-toolchain/host-operator/pull/1068 same changes as in https://github.com/codeready-toolchain/toolchain-e2e/pull/1018 Signed-off-by: Xavier Coulon --- go.mod | 4 ++++ go.sum | 8 ++++---- test/e2e/parallel/space_test.go | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index fcce71265..4eed2cc25 100644 --- a/go.mod +++ b/go.mod @@ -31,6 +31,10 @@ require ( sigs.k8s.io/controller-runtime v0.13.0 ) +replace github.com/codeready-toolchain/api => github.com/xcoulon/api v0.0.0-20240725145329-0fc7541fe19e + +replace github.com/codeready-toolchain/toolchain-common => github.com/xcoulon/toolchain-common v0.0.0-20240725145759-056fcf98e945 + require github.com/google/uuid v1.6.0 require ( diff --git a/go.sum b/go.sum index 8ffa62b72..a78ce43ed 100644 --- a/go.sum +++ b/go.sum @@ -123,10 +123,6 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/codeready-toolchain/api v0.0.0-20240717145630-bb67a632867a h1:La7GOCysmkU+4vnN8lDzXFJwJiA1LWZ9YkX/yQXYnpw= -github.com/codeready-toolchain/api v0.0.0-20240717145630-bb67a632867a/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240716065433-8604fe46b96a h1:HcaJtZCLfYkWZCxIa3iTvq3zgn711JGqPLkunBTfGSc= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240716065433-8604fe46b96a/go.mod h1:8M9k7w2VSyRKSK6P08Jo2ddW3uyGgxCcSitnYa3HK9o= 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= @@ -660,6 +656,10 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/xcoulon/api v0.0.0-20240725145329-0fc7541fe19e h1:6rYzVUcLeuVHmFjd7BU/Oe1SMsPrwdQgak2EYMz+oxM= +github.com/xcoulon/api v0.0.0-20240725145329-0fc7541fe19e/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= +github.com/xcoulon/toolchain-common v0.0.0-20240725145759-056fcf98e945 h1:s7dhWL8+zBI8+bIFzk0EATb6ASGlkA59PHSRvhhxeBc= +github.com/xcoulon/toolchain-common v0.0.0-20240725145759-056fcf98e945/go.mod h1:7o3ZyfqhV16N2Hc3P6j9lx0x6sLhQ0gaVl2cpGAz3ZE= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= diff --git a/test/e2e/parallel/space_test.go b/test/e2e/parallel/space_test.go index 957e92a59..bd6d3d361 100644 --- a/test/e2e/parallel/space_test.go +++ b/test/e2e/parallel/space_test.go @@ -7,7 +7,6 @@ import ( toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1" testspace "github.com/codeready-toolchain/toolchain-common/pkg/test/space" - "github.com/codeready-toolchain/toolchain-e2e/testsupport" . "github.com/codeready-toolchain/toolchain-e2e/testsupport" . "github.com/codeready-toolchain/toolchain-e2e/testsupport/space" testsupportsb "github.com/codeready-toolchain/toolchain-e2e/testsupport/spacebinding" @@ -250,7 +249,7 @@ func TestPromoteSpace(t *testing.T) { hostAwait := awaitilities.Host() memberAwait := awaitilities.Member1() - user := testsupport.NewSignupRequest(awaitilities). + user := NewSignupRequest(awaitilities). ManuallyApprove(). TargetCluster(memberAwait). RequireConditions(ConditionSet(Default(), ApprovedByAdmin())...). From 49e3497d66dd20d090d328e000379994f09d897b Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Thu, 1 Aug 2024 12:07:26 +0200 Subject: [PATCH 2/5] update doc Signed-off-by: Xavier Coulon --- quay.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/quay.adoc b/quay.adoc index 64ffb7132..9bf3541cd 100644 --- a/quay.adoc +++ b/quay.adoc @@ -13,7 +13,6 @@ There is a set of images that is built and pushed to quay repositories while dep * https://quay.io/repository//host-operator-bundle * https://quay.io/repository//host-operator-index * https://quay.io/repository//member-operator - * https://quay.io/repository//member-operator-console-plugin * https://quay.io/repository//member-operator-webhook * https://quay.io/repository//member-operator-bundle * https://quay.io/repository//member-operator-index @@ -27,7 +26,6 @@ All aforementioned repositories has to be public, so make sure that the visibili * https://quay.io/repository//host-operator-bundle?tab=settings * https://quay.io/repository//host-operator-index?tab=settings * https://quay.io/repository//member-operator?tab=settings -* https://quay.io/repository//member-operator-console-plugin?tab=settings * https://quay.io/repository//member-operator-webhook?tab=settings * https://quay.io/repository//member-operator-bundle?tab=settings * https://quay.io/repository//member-operator-index?tab=settings From cb30c1bca356ef3f242ead0b0d7ede78c6a546f1 Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Thu, 1 Aug 2024 18:09:46 +0200 Subject: [PATCH 3/5] update go mod Signed-off-by: Xavier Coulon --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 4eed2cc25..fc8251c0b 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/codeready-toolchain/toolchain-e2e require ( - github.com/codeready-toolchain/api v0.0.0-20240717145630-bb67a632867a - github.com/codeready-toolchain/toolchain-common v0.0.0-20240716065433-8604fe46b96a + github.com/codeready-toolchain/api v0.0.0-20240801160201-ed4387f19137 + github.com/codeready-toolchain/toolchain-common v0.0.0-20240801160555-2f18a82d9752 github.com/davecgh/go-spew v1.1.1 github.com/fatih/color v1.12.0 github.com/ghodss/yaml v1.0.0 From 341614176045b8e2db1a9bfee7cf74e21426b6b9 Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Fri, 2 Aug 2024 10:10:59 +0200 Subject: [PATCH 4/5] update go mod Signed-off-by: Xavier Coulon --- go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go.mod b/go.mod index fc8251c0b..3eb970ad4 100644 --- a/go.mod +++ b/go.mod @@ -31,10 +31,6 @@ require ( sigs.k8s.io/controller-runtime v0.13.0 ) -replace github.com/codeready-toolchain/api => github.com/xcoulon/api v0.0.0-20240725145329-0fc7541fe19e - -replace github.com/codeready-toolchain/toolchain-common => github.com/xcoulon/toolchain-common v0.0.0-20240725145759-056fcf98e945 - require github.com/google/uuid v1.6.0 require ( From 9431fb6b29063071722f84c5c830c6612bf1a752 Mon Sep 17 00:00:00 2001 From: Xavier Coulon Date: Fri, 2 Aug 2024 10:12:11 +0200 Subject: [PATCH 5/5] update go mod Signed-off-by: Xavier Coulon --- go.sum | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/go.sum b/go.sum index a78ce43ed..d92dc2e2c 100644 --- a/go.sum +++ b/go.sum @@ -123,6 +123,10 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/codeready-toolchain/api v0.0.0-20240801160201-ed4387f19137 h1:axAZH/Ku+QHu2eQjlx/a7dctWRgj0T3K4gfnq1fzKFo= +github.com/codeready-toolchain/api v0.0.0-20240801160201-ed4387f19137/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240801160555-2f18a82d9752 h1:6cFp7ql7CTdk83GktAbVLYZDHRC63gei27uIFSbq8ho= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240801160555-2f18a82d9752/go.mod h1:VIJaZyLIblt9/HqIsJn7Hlu4RqG9/hNCznE0Uge4H+g= 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= @@ -656,10 +660,6 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/xcoulon/api v0.0.0-20240725145329-0fc7541fe19e h1:6rYzVUcLeuVHmFjd7BU/Oe1SMsPrwdQgak2EYMz+oxM= -github.com/xcoulon/api v0.0.0-20240725145329-0fc7541fe19e/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/xcoulon/toolchain-common v0.0.0-20240725145759-056fcf98e945 h1:s7dhWL8+zBI8+bIFzk0EATb6ASGlkA59PHSRvhhxeBc= -github.com/xcoulon/toolchain-common v0.0.0-20240725145759-056fcf98e945/go.mod h1:7o3ZyfqhV16N2Hc3P6j9lx0x6sLhQ0gaVl2cpGAz3ZE= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=