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

KUBESAW-43: Replace the special ToolchainClusterCondition with the standard toolchain Condition #560

Merged
merged 13 commits into from
May 30, 2024
Merged

KUBESAW-43: Replace the special ToolchainClusterCondition with the standard toolchain Condition #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cbbb5b7
KUBESAW-43: Replace the special ToolchainClusterCondition with the st…
fbm3307 Apr 25, 2024
994e426
Updating tc, api dependency
fbm3307 Apr 25, 2024
9d9f655
Merge branch 'master' into ks43rc
fbm3307 Apr 29, 2024
6b755b2
Merge branch 'master' into ks43rc
fbm3307 May 2, 2024
18dc333
Updating api,tc dependecny-3
fbm3307 May 2, 2024
cb793a5
Merge branch 'master' into ks43rc
fbm3307 May 14, 2024
b454004
updating api,toolchaincommon and related changes
fbm3307 May 14, 2024
71768fc
updating the dependency of api, tc with latest changes
fbm3307 May 15, 2024
bd16841
Merge branch 'master' into ks43rc
fbm3307 May 16, 2024
8051f3d
api,tc update
fbm3307 May 27, 2024
1637cf2
removing the duplicate conditiontype , api tc update
fbm3307 May 29, 2024
97a7389
Merge branch 'master' into ks43rc
fbm3307 May 30, 2024
644dc00
Final update api,tc
fbm3307 May 30, 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
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_memberstatuses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
8 changes: 1 addition & 7 deletions config/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/codeready-toolchain/member-operator

require (
github.com/codeready-toolchain/api v0.0.0-20240514085958-3b5237399fe5
github.com/codeready-toolchain/toolchain-common v0.0.0-20240514101749-1ceadb6ea36b
github.com/codeready-toolchain/api v0.0.0-20240530120602-c11598ccffb7
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'
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ 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-20240514085958-3b5237399fe5 h1:lfW7VPmj70Tt75VzgOfAdVEGKMCR5/zACugWl1BDw34=
github.com/codeready-toolchain/api v0.0.0-20240514085958-3b5237399fe5/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/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-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=
Expand Down
9 changes: 4 additions & 5 deletions test/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}},
},
Expand All @@ -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,
}},
},
Expand Down
Loading