From 88448d939bc77876f1fdd84fdb75eee8da01bc98 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 24 Jun 2024 12:04:04 +0530 Subject: [PATCH 1/9] KUBESAW-100: refactor tc-toolchain-cluster controller Signed-off-by: Feny Mehta --- go.mod | 5 ++++- go.sum | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6b501e563..475e22e3d 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,8 @@ module github.com/codeready-toolchain/host-operator +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c require ( - github.com/codeready-toolchain/api v0.0.0-20240530120602-c11598ccffb7 + github.com/codeready-toolchain/api v0.0.0-20240620205422-a29b6c658d03 github.com/codeready-toolchain/toolchain-common v0.0.0-20240613121043-7e6ef858cdff github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-bindata/go-bindata v3.1.2+incompatible @@ -113,3 +114,5 @@ require ( ) go 1.20 + +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c diff --git a/go.sum b/go.sum index fdb329b10..ffa20fd83 100644 --- a/go.sum +++ b/go.sum @@ -136,10 +136,8 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH 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-20240530120602-c11598ccffb7 h1:o5JLcHCVS1BlZevw2mh1mH+iKwn9fLUrT1Ek8NFjvPY= -github.com/codeready-toolchain/api v0.0.0-20240530120602-c11598ccffb7/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240613121043-7e6ef858cdff h1:bVWL+2eayFKUnEzdEAwltPs+pzbGlGDSmrM3oOV2Ams= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240613121043-7e6ef858cdff/go.mod h1:cyHrUfvBYEtsf+FbqQYmR9y0AQi9QAVtM3SUWLA5bd4= +github.com/codeready-toolchain/api v0.0.0-20240620205422-a29b6c658d03 h1:uqApdceOkNQI1wy2gwA6pEUzhLlqqbbc+ChTvEshIW0= +github.com/codeready-toolchain/api v0.0.0-20240620205422-a29b6c658d03/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= 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= @@ -193,6 +191,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= +github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c h1:DU55O/o55tRJjEpcbAw0IHwWFwA19gMSyOOEiBQpHy4= +github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= From 9ccf04fc0fa4d7e84dc1031912b5137a4ccbe827 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Wed, 26 Jun 2024 11:30:12 +0530 Subject: [PATCH 2/9] updating tc dependecnies and related changes Signed-off-by: Feny Mehta --- go.mod | 4 ++-- go.sum | 4 ++-- main.go | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 475e22e3d..6e29ef32d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240626054411-0d94d353157c + require ( github.com/codeready-toolchain/api v0.0.0-20240620205422-a29b6c658d03 github.com/codeready-toolchain/toolchain-common v0.0.0-20240613121043-7e6ef858cdff @@ -115,4 +116,3 @@ require ( go 1.20 -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c diff --git a/go.sum b/go.sum index ffa20fd83..466caf272 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c h1:DU55O/o55tRJjEpcbAw0IHwWFwA19gMSyOOEiBQpHy4= -github.com/fbm3307/toolchain-common v0.0.0-20240624053626-8b37e8f7386c/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240626054411-0d94d353157c h1:o1Dxvns4TcEPOLxAeJnx/+VoAoAD3bKr5XXH4EplmW4= +github.com/fbm3307/toolchain-common v0.0.0-20240626054411-0d94d353157c/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/main.go b/main.go index 84c9b9423..6900d1dfc 100644 --- a/main.go +++ b/main.go @@ -226,9 +226,10 @@ func main() { // nolint:gocyclo } if err := (&toolchaincluster.Reconciler{ - Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), - RequeAfter: 10 * time.Second, + Client: mgr.GetClient(), + Scheme: mgr.GetScheme(), + RequeAfter: 10 * time.Second, + CheckHealth: toolchaincluster.GetClusterHealthStatus, }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "ToolchainCluster") os.Exit(1) From a2c53093f311f24cc502926469a6f53afcb8d13b Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Tue, 2 Jul 2024 19:11:25 +0530 Subject: [PATCH 3/9] Updating after changes to tc Signed-off-by: Feny Mehta --- go.mod | 3 +-- go.sum | 6 ++---- main.go | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 0416b96d1..6ee0db57c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240626054411-0d94d353157c +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240702113651-1b5b160ab47a require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 @@ -130,4 +130,3 @@ require ( ) go 1.20 - diff --git a/go.sum b/go.sum index 98c9f2bef..4b6eadbf1 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,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-20240627084210-f4a765461e75 h1:LOrOMTw3bplM+VwzSxi3j9GNseujhcebO/LGr8b95GE= github.com/codeready-toolchain/api v0.0.0-20240627084210-f4a765461e75/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a h1:hXS9egkRRCyvUE//MJf+LDhH3mt1DDaWNFwTenex2dA= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= 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= @@ -194,8 +192,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240626054411-0d94d353157c h1:o1Dxvns4TcEPOLxAeJnx/+VoAoAD3bKr5XXH4EplmW4= -github.com/fbm3307/toolchain-common v0.0.0-20240626054411-0d94d353157c/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240702113651-1b5b160ab47a h1:Zb3XG11094zApuL2YQHnBcMqW3uk+09CxaJUy0OPe+E= +github.com/fbm3307/toolchain-common v0.0.0-20240702113651-1b5b160ab47a/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/main.go b/main.go index eaf8e658f..6dba74cad 100644 --- a/main.go +++ b/main.go @@ -240,7 +240,7 @@ func main() { // nolint:gocyclo Client: mgr.GetClient(), Scheme: mgr.GetScheme(), RequeAfter: 10 * time.Second, - CheckHealth: toolchaincluster.GetClusterHealthStatus, + CheckHealth: toolchaincluster.GetClusterHealth, }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "ToolchainCluster") os.Exit(1) From 9df7d75beb738e41b732d37d24ded744206809d1 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Wed, 3 Jul 2024 14:10:02 +0530 Subject: [PATCH 4/9] uptc Signed-off-by: Feny Mehta --- go.mod | 2 +- go.sum | 4 ++-- main.go | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 6ee0db57c..fa307e262 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240702113651-1b5b160ab47a +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240703083147-68c2067ceef4 require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 diff --git a/go.sum b/go.sum index 4b6eadbf1..ac59e86fd 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240702113651-1b5b160ab47a h1:Zb3XG11094zApuL2YQHnBcMqW3uk+09CxaJUy0OPe+E= -github.com/fbm3307/toolchain-common v0.0.0-20240702113651-1b5b160ab47a/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240703083147-68c2067ceef4 h1:SSWmQeaEX9Qo8F1L2N/TXb5CEfVwH5lEzJiYtEtAZME= +github.com/fbm3307/toolchain-common v0.0.0-20240703083147-68c2067ceef4/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/main.go b/main.go index 6dba74cad..71bec74f7 100644 --- a/main.go +++ b/main.go @@ -237,10 +237,9 @@ func main() { // nolint:gocyclo } if err := (&toolchaincluster.Reconciler{ - Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), - RequeAfter: 10 * time.Second, - CheckHealth: toolchaincluster.GetClusterHealth, + Client: mgr.GetClient(), + Scheme: mgr.GetScheme(), + RequeAfter: 10 * time.Second, }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "ToolchainCluster") os.Exit(1) From f374b4a50454fde90d0f459bd7720ee9af7c8c22 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 4 Jul 2024 14:43:28 +0530 Subject: [PATCH 5/9] updating after useage of lastupdated time Signed-off-by: Feny Mehta --- go.mod | 4 +++- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fa307e262..e454b599d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240703083147-68c2067ceef4 +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240704090545-98893bbdb711 require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 @@ -130,3 +130,5 @@ require ( ) go 1.20 + + diff --git a/go.sum b/go.sum index ac59e86fd..193ebd0a8 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240703083147-68c2067ceef4 h1:SSWmQeaEX9Qo8F1L2N/TXb5CEfVwH5lEzJiYtEtAZME= -github.com/fbm3307/toolchain-common v0.0.0-20240703083147-68c2067ceef4/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240704090545-98893bbdb711 h1:oaFfAEeqZJKkgjh+E40dXEFLR5P9d2nK+p5vayjmYSE= +github.com/fbm3307/toolchain-common v0.0.0-20240704090545-98893bbdb711/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= From 8843b9c34df680709a3f68dd8ccf2c1a37f4220d Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 4 Jul 2024 17:28:33 +0530 Subject: [PATCH 6/9] rc1-tc Signed-off-by: Feny Mehta --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e454b599d..c62d0668c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240704090545-98893bbdb711 +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240704115306-a61b21af97e5 require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 @@ -130,5 +130,3 @@ require ( ) go 1.20 - - diff --git a/go.sum b/go.sum index 193ebd0a8..e21d802c0 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240704090545-98893bbdb711 h1:oaFfAEeqZJKkgjh+E40dXEFLR5P9d2nK+p5vayjmYSE= -github.com/fbm3307/toolchain-common v0.0.0-20240704090545-98893bbdb711/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240704115306-a61b21af97e5 h1:erbjKqdms+lLCsLhDT0i5au3I7QAaTFfdL5PPNgAzlA= +github.com/fbm3307/toolchain-common v0.0.0-20240704115306-a61b21af97e5/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= From 0b7ae927d83f87b03e1d5a144da01a7dce327df4 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Tue, 9 Jul 2024 15:47:31 +0530 Subject: [PATCH 7/9] update after cleanup and rc Signed-off-by: Feny Mehta --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d1a185d1f..a8615f55e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240704115306-a61b21af97e5 +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240708105947-4161cd43570e require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 diff --git a/go.sum b/go.sum index 64bb2b910..34cfcbccc 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,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-20240708122235-0af5a9a178bb h1:Wc9CMsv0ODZv9dM5qF3OI0mFDO95YNIXV/8oRvoz8aE= github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a h1:hXS9egkRRCyvUE//MJf+LDhH3mt1DDaWNFwTenex2dA= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240628050807-7f226f55a34a/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= 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= @@ -194,8 +192,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240704115306-a61b21af97e5 h1:erbjKqdms+lLCsLhDT0i5au3I7QAaTFfdL5PPNgAzlA= -github.com/fbm3307/toolchain-common v0.0.0-20240704115306-a61b21af97e5/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240708105947-4161cd43570e h1:5BJ+FUsL41yN61YV1EERBzKY2UrX+EedIw8gmJb3W2E= +github.com/fbm3307/toolchain-common v0.0.0-20240708105947-4161cd43570e/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= From 9f1cd916c73c8d96df25ee5a7b2bb8ab23d280a0 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Thu, 11 Jul 2024 21:43:59 +0530 Subject: [PATCH 8/9] 1probably 1 before final Signed-off-by: Feny Mehta --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f5e093d60..e1454807d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240708105947-4161cd43570e +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240711160323-7b00b3208eb1 require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 diff --git a/go.sum b/go.sum index 666d4ef4a..dd9df0f9b 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,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-20240708122235-0af5a9a178bb h1:Wc9CMsv0ODZv9dM5qF3OI0mFDO95YNIXV/8oRvoz8aE= github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240711082950-c7f9f4442ae0 h1:v7Z5i0JaF1H9SYxK/uEjWgH8Vpm4Eg3OJep/Pl/2iyM= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240711082950-c7f9f4442ae0/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= @@ -194,8 +192,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240708105947-4161cd43570e h1:5BJ+FUsL41yN61YV1EERBzKY2UrX+EedIw8gmJb3W2E= -github.com/fbm3307/toolchain-common v0.0.0-20240708105947-4161cd43570e/go.mod h1:ZwfGkrTArynbvIPOJwQQCwFVW7Dj0XOgi5XzkNG1ov8= +github.com/fbm3307/toolchain-common v0.0.0-20240711160323-7b00b3208eb1 h1:ZGBbL3NTI9dNANXy+mk2y8sBHJ2LTBVNAif1pIaOx3A= +github.com/fbm3307/toolchain-common v0.0.0-20240711160323-7b00b3208eb1/go.mod h1:8M9k7w2VSyRKSK6P08Jo2ddW3uyGgxCcSitnYa3HK9o= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= From 19c6b2c7a6afcd92910b57a4265b2887aa348667 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Tue, 16 Jul 2024 12:26:28 +0530 Subject: [PATCH 9/9] removing replace of tc Signed-off-by: Feny Mehta --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e1454807d..3dcfa4718 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,9 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240711160323-7b00b3208eb1 - require ( cloud.google.com/go/recaptchaenterprise/v2 v2.13.0 github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb - github.com/codeready-toolchain/toolchain-common v0.0.0-20240711082950-c7f9f4442ae0 + github.com/codeready-toolchain/toolchain-common v0.0.0-20240716065433-8604fe46b96a github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/go-logr/logr v1.4.1 diff --git a/go.sum b/go.sum index dd9df0f9b..f57bb20b1 100644 --- a/go.sum +++ b/go.sum @@ -139,6 +139,8 @@ 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-20240708122235-0af5a9a178bb h1:Wc9CMsv0ODZv9dM5qF3OI0mFDO95YNIXV/8oRvoz8aE= github.com/codeready-toolchain/api v0.0.0-20240708122235-0af5a9a178bb/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= @@ -192,8 +194,6 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240711160323-7b00b3208eb1 h1:ZGBbL3NTI9dNANXy+mk2y8sBHJ2LTBVNAif1pIaOx3A= -github.com/fbm3307/toolchain-common v0.0.0-20240711160323-7b00b3208eb1/go.mod h1:8M9k7w2VSyRKSK6P08Jo2ddW3uyGgxCcSitnYa3HK9o= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=