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

KSPACE-20: Drop the distinction between host & member ToolchainClusters #531

Merged
merged 10 commits into from
Mar 13, 2024
Merged

KSPACE-20: Drop the distinction between host & member ToolchainClusters #531

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b95348a
KSPACE-20: Drop the distinction between host & member ToolchainClusters
fbm3307 Feb 12, 2024
4fdd73e
review comments
fbm3307 Feb 15, 2024
3aa71b1
Merge branch 'master' into ks20drptcrtype
fbm3307 Feb 19, 2024
3cf6b27
Merge branch 'master' into ks20drptcrtype
fbm3307 Feb 26, 2024
d1bd3f4
Merge branch 'master' into ks20drptcrtype
fbm3307 Mar 5, 2024
edbe626
Removing useclusterCL
fbm3307 Mar 5, 2024
ff5afbd
Merge branch 'master' into ks20drptcrtype
fbm3307 Mar 6, 2024
02f70ca
Merge branch 'master' into ks20drptcrtype
mfrancisc Mar 7, 2024
5034c43
Merge branch 'master' into ks20drptcrtype
fbm3307 Mar 12, 2024
4143a8a
Replace go mod -toolchain-common
fbm3307 Mar 13, 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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module github.com/codeready-toolchain/member-operator

replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801

require (
github.com/codeready-toolchain/api v0.0.0-20240227210924-371ddb054d87
github.com/codeready-toolchain/toolchain-common v0.0.0-20240227212148-b32711b41532
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,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-20240227210924-371ddb054d87 h1:eQLsrMqfjAzGfuO9t6pVxO4K6cUDKOMxEvl0ujQq/2I=
github.com/codeready-toolchain/api v0.0.0-20240227210924-371ddb054d87/go.mod h1:FO7kgXH1x1LqkF327D5a36u0WIrwjVCbeijPkzgwaZc=
github.com/codeready-toolchain/toolchain-common v0.0.0-20240227212148-b32711b41532 h1:mfTiDF9af5hmc23AR1DreoCcyLTeAJKhYbFPyd7f/+Q=
github.com/codeready-toolchain/toolchain-common v0.0.0-20240227212148-b32711b41532/go.mod h1:nA1+TOD7zDS6spCBTaIZ63B/KyysR66fJI3DUT86kKE=
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 Expand Up @@ -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-20240305070612-850515566801 h1:S5edSNzI+e+xzr4dVmJ4tQcQiWgWTy6wpCbEGfNZm/s=
github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801/go.mod h1:nA1+TOD7zDS6spCBTaIZ63B/KyysR66fJI3DUT86kKE=
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=
Expand Down
2 changes: 0 additions & 2 deletions test/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ func NewGetHostCluster(cl client.Client, ok bool, status v1.ConditionStatus) clu
return func() (toolchainCluster *cluster.CachedToolchainCluster, b bool) {
return &cluster.CachedToolchainCluster{
Config: &cluster.Config{
Type: cluster.Host,
OperatorNamespace: test.HostOperatorNs,
OwnerClusterName: test.MemberClusterName,
},
Expand Down Expand Up @@ -51,7 +50,6 @@ func NewGetHostClusterWithProbe(cl client.Client, ok bool, status v1.ConditionSt
return func() (toolchainCluster *cluster.CachedToolchainCluster, b bool) {
return &cluster.CachedToolchainCluster{
Config: &cluster.Config{
Type: cluster.Host,
OperatorNamespace: test.HostOperatorNs,
OwnerClusterName: test.MemberClusterName,
},
Expand Down
Loading