From 8341ceda75ed0906711a3a2e007361bcf83225b8 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 6 May 2024 16:55:36 +0530 Subject: [PATCH 1/2] KUBESAW-43: Introduce LastUpdatedTime as prefered one Signed-off-by: Feny Mehta --- go.mod | 6 ++++-- go.sum | 8 ++++---- test/cluster.go | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 41d8d026..0e31836f 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/codeready-toolchain/member-operator require ( - github.com/codeready-toolchain/api v0.0.0-20240322110702-5ab3840476e9 - github.com/codeready-toolchain/toolchain-common v0.0.0-20240422084400-e6d41ea74313 + github.com/codeready-toolchain/api v0.0.0-20240502171347-8db815b922bd + github.com/codeready-toolchain/toolchain-common v0.0.0-20240429224949-78585f71122a github.com/go-logr/logr v1.2.3 github.com/google/go-cmp v0.5.9 // using latest commit from 'github.com/openshift/api branch release-4.12' @@ -110,3 +110,5 @@ require ( ) go 1.20 + +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240506111634-a7d67ac8e37b diff --git a/go.sum b/go.sum index 0b5859eb..4a15b644 100644 --- a/go.sum +++ b/go.sum @@ -134,10 +134,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-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-20240422084400-e6d41ea74313 h1:UuLjLbn8Rh1QX8jyLipAtaZ3o25Ard33B2+DCcmJLsQ= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240422084400-e6d41ea74313/go.mod h1:rfVQhC9ctteNi2vbg300fgD0zgTfk/h3qjW9nsCayFs= +github.com/codeready-toolchain/api v0.0.0-20240502171347-8db815b922bd h1:znIdWMiUgIJ/ypSQ17NemR+29V688DUjH6xrG3eBEMo= +github.com/codeready-toolchain/api v0.0.0-20240502171347-8db815b922bd/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= @@ -185,6 +183,8 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM 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-20240506111634-a7d67ac8e37b h1:C3pxbm0lMis8PqEpD5CFtZyz8VZguqO/4Y2kgFm97wQ= +github.com/fbm3307/toolchain-common v0.0.0-20240506111634-a7d67ac8e37b/go.mod h1:tT/m6IA9jY+7/gsCsHv9CA4Q0E1VjaRVKSXgf9ucJ78= 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/test/cluster.go b/test/cluster.go index 1c46ec73..1f4a673e 100644 --- a/test/cluster.go +++ b/test/cluster.go @@ -56,9 +56,10 @@ func NewGetHostClusterWithProbe(cl client.Client, ok bool, status v1.ConditionSt Client: cl, ClusterStatus: &toolchainv1alpha1.ToolchainClusterStatus{ Conditions: []toolchainv1alpha1.ToolchainClusterCondition{{ - Type: toolchainv1alpha1.ToolchainClusterReady, - Status: status, - LastProbeTime: lastProbeTime, + Type: toolchainv1alpha1.ToolchainClusterReady, + Status: status, + LastProbeTime: lastProbeTime, + LastUpdatedTime: &lastProbeTime, }}, }, }, true From 3fd18d8557b54cc2377e1270088edfb0e0c5bc90 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 13 May 2024 16:14:48 +0530 Subject: [PATCH 2/2] Updating toolchain-common dependency 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 5822c756..85a96089 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/codeready-toolchain/member-operator require ( github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5 - github.com/codeready-toolchain/toolchain-common v0.0.0-20240507174147-ed50ce546b3c + github.com/codeready-toolchain/toolchain-common v0.0.0-20240513103602-0cabe6c279c8 github.com/go-logr/logr v1.2.3 github.com/google/go-cmp v0.5.9 // using latest commit from 'github.com/openshift/api branch release-4.12' @@ -110,5 +110,3 @@ require ( ) go 1.20 - -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240506111634-a7d67ac8e37b diff --git a/go.sum b/go.sum index db387231..14392fee 100644 --- a/go.sum +++ b/go.sum @@ -136,6 +136,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-20240507023248-73662d6db2c5 h1:BPIwkb0fqJEJ5GjMFgkoo13f8AY5UTWmPD4Hcm1GqoU= github.com/codeready-toolchain/api v0.0.0-20240507023248-73662d6db2c5/go.mod h1:ie9p4LenCCS0LsnbWp6/xwpFDdCWYE0KWzUO6Sk1g0E= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240513103602-0cabe6c279c8 h1:6m0CiQDEzBbs9cR5UWLyOcuFgDSgWSgbGajsoV42fC0= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240513103602-0cabe6c279c8/go.mod h1:5ZCAINI2sJifBbe48IHJzDc/GuuWFb5HOL4kWB+a+pA= 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= @@ -183,8 +185,6 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM 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-20240506111634-a7d67ac8e37b h1:C3pxbm0lMis8PqEpD5CFtZyz8VZguqO/4Y2kgFm97wQ= -github.com/fbm3307/toolchain-common v0.0.0-20240506111634-a7d67ac8e37b/go.mod h1:tT/m6IA9jY+7/gsCsHv9CA4Q0E1VjaRVKSXgf9ucJ78= 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=