merge master

codeready-toolchain · May 31, 2024 · a167dad · a167dad
2 parents b1e06d8 + c8d1820
commit a167dad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 22 deletions.
diff --git a/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml b/config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml
@@ -169,13 +169,7 @@ spec:
                   conditions:
                     description: Conditions is an array of current cluster conditions.
                     items:
-                      description: ToolchainClusterCondition describes current state
-                        of a cluster.
                       properties:
-                        lastProbeTime:
-                          description: Last time the condition was checked.
-                          format: date-time
-                          type: string
                         lastTransitionTime:
                           description: Last time the condition transit from one status
                             to another.
@@ -197,7 +191,7 @@ spec:
                             Unknown.
                           type: string
                         type:
-                          description: Type of cluster condition, Ready or Offline.
+                          description: Type of condition
                           type: string
                       required:
                       - status

diff --git a/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml b/config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml
@@ -81,13 +81,7 @@ spec:
               conditions:
                 description: Conditions is an array of current cluster conditions.
                 items:
-                  description: ToolchainClusterCondition describes current state of
-                    a cluster.
                   properties:
-                    lastProbeTime:
-                      description: Last time the condition was checked.
-                      format: date-time
-                      type: string
                     lastTransitionTime:
                       description: Last time the condition transit from one status
                         to another.
@@ -108,7 +102,7 @@ spec:
                       description: Status of the condition, one of True, False, Unknown.
                       type: string
                     type:
-                      description: Type of cluster condition, Ready or Offline.
+                      description: Type of condition
                       type: string
                   required:
                   - status

diff --git 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-20240530120602-c11598ccffb7
-	github.com/codeready-toolchain/toolchain-common v0.0.0-20240514101749-1ceadb6ea36b
+	github.com/codeready-toolchain/toolchain-common v0.0.0-20240530121312-98aad712838f
 	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'

diff --git a/go.sum b/go.sum
@@ -136,8 +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-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-20240514101749-1ceadb6ea36b h1:9WGqXkgAmnMOYUvYSdeIszTfE5NbuZ2hmibXchTU7r0=
-github.com/codeready-toolchain/toolchain-common v0.0.0-20240514101749-1ceadb6ea36b/go.mod h1:oG4ywphvcYpFuaxrJcAkEVrBfhXsXPPQ2ieF3Y+e/wo=
+github.com/codeready-toolchain/toolchain-common v0.0.0-20240530121312-98aad712838f h1:2qfRfyh7wfEnnfxrUtQeQrvhzWlkBCN0B/UXv1YUMiA=
+github.com/codeready-toolchain/toolchain-common v0.0.0-20240530121312-98aad712838f/go.mod h1:cyHrUfvBYEtsf+FbqQYmR9y0AQi9QAVtM3SUWLA5bd4=
 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=

diff --git a/test/cluster.go b/test/cluster.go
@@ -28,8 +28,8 @@ func NewGetHostCluster(cl client.Client, ok bool, status v1.ConditionStatus) clu
 			},
 			Client: cl,
 			ClusterStatus: &toolchainv1alpha1.ToolchainClusterStatus{
-				Conditions: []toolchainv1alpha1.ToolchainClusterCondition{{
-					Type:   toolchainv1alpha1.ToolchainClusterReady,
+				Conditions: []toolchainv1alpha1.Condition{{
+					Type:   toolchainv1alpha1.ConditionReady,
 					Status: status,
 				}},
 			},
@@ -55,10 +55,9 @@ func NewGetHostClusterWithProbe(cl client.Client, ok bool, status v1.ConditionSt
 			},
 			Client: cl,
 			ClusterStatus: &toolchainv1alpha1.ToolchainClusterStatus{
-				Conditions: []toolchainv1alpha1.ToolchainClusterCondition{{
-					Type:            toolchainv1alpha1.ToolchainClusterReady,
+				Conditions: []toolchainv1alpha1.Condition{{
+					Type:            toolchainv1alpha1.ConditionReady,
 					Status:          status,
-					LastProbeTime:   lastProbeTime,
 					LastUpdatedTime: &lastProbeTime,
 				}},
 			},