From 85cfa60bc3f69e64aec0fba0ad7393455632255a Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 6 Oct 2025 11:58:58 +0530 Subject: [PATCH 1/3] Update API & toolchain-common (to check removal of che config) Signed-off-by: Feny Mehta --- go.mod | 4 ++++ go.sum | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 4de436dc..de2556ae 100644 --- a/go.mod +++ b/go.mod @@ -128,3 +128,7 @@ require ( go 1.23.0 toolchain go1.23.12 + +replace github.com/codeready-toolchain/api => github.com/fbm3307/toolchainapi v0.0.0-20250924125641-c3fceab9da63 + +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20250923073415-a1ecb04daf74 diff --git a/go.sum b/go.sum index b0d53731..c1f1c6e7 100644 --- a/go.sum +++ b/go.sum @@ -20,10 +20,6 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= -github.com/codeready-toolchain/api v0.0.0-20250916082953-4ecb3a4645e6 h1:3Z1nQ7CjBCphWyGkEUCSMrd4VfuxzOVYyEi9/7FjLPs= -github.com/codeready-toolchain/api v0.0.0-20250916082953-4ecb3a4645e6/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU= -github.com/codeready-toolchain/toolchain-common v0.0.0-20250916085517-b50328535b99 h1:SsnXrGSvi7wMPbYmfXSWi5MCDLCsNovImaR5dahkX/k= -github.com/codeready-toolchain/toolchain-common v0.0.0-20250916085517-b50328535b99/go.mod h1:okjVzS+73Z1nOjq0IUP1db0y2SY1fDq/nb3/t7zJLlE= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -40,6 +36,10 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/fbm3307/toolchain-common v0.0.0-20250923073415-a1ecb04daf74 h1:jG0jCum+M4P9ykAcKhC/kpSmDsb8nmHP0r/WBk3MlSw= +github.com/fbm3307/toolchain-common v0.0.0-20250923073415-a1ecb04daf74/go.mod h1:eySMK8JR/Py9eoUJlAkOXqvfPp1vjl39scgrECr99XM= +github.com/fbm3307/toolchainapi v0.0.0-20250924125641-c3fceab9da63 h1:8RpBze7D8bfXXvrTZ1k68OzNRnxVMa8w53/qMFghMw8= +github.com/fbm3307/toolchainapi v0.0.0-20250924125641-c3fceab9da63/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= From c0a1b56969545517edfb7886acce16b7dfc7a5a7 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 6 Oct 2025 20:24:48 +0530 Subject: [PATCH 2/3] changes in api and tc Signed-off-by: Feny Mehta --- go.mod | 6 ++---- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index de2556ae..1bb99313 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-20250916082953-4ecb3a4645e6 - github.com/codeready-toolchain/toolchain-common v0.0.0-20250916085517-b50328535b99 + github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 // using latest commit from 'github.com/openshift/api branch release-4.19' @@ -129,6 +129,4 @@ go 1.23.0 toolchain go1.23.12 -replace github.com/codeready-toolchain/api => github.com/fbm3307/toolchainapi v0.0.0-20250924125641-c3fceab9da63 - -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20250923073415-a1ecb04daf74 +replace github.com/codeready-toolchain/api => github.com/fbm3307/toolchainapi v0.0.0-20251006141716-2be085acfe3e diff --git a/go.sum b/go.sum index c1f1c6e7..eb6a17f7 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= +github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1 h1:jqs4yOuJbfW3CKe1EMJkkDo47wTKQ4M1OKox4DYWsKg= +github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1/go.mod h1:eySMK8JR/Py9eoUJlAkOXqvfPp1vjl39scgrECr99XM= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -36,10 +38,8 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= -github.com/fbm3307/toolchain-common v0.0.0-20250923073415-a1ecb04daf74 h1:jG0jCum+M4P9ykAcKhC/kpSmDsb8nmHP0r/WBk3MlSw= -github.com/fbm3307/toolchain-common v0.0.0-20250923073415-a1ecb04daf74/go.mod h1:eySMK8JR/Py9eoUJlAkOXqvfPp1vjl39scgrECr99XM= -github.com/fbm3307/toolchainapi v0.0.0-20250924125641-c3fceab9da63 h1:8RpBze7D8bfXXvrTZ1k68OzNRnxVMa8w53/qMFghMw8= -github.com/fbm3307/toolchainapi v0.0.0-20250924125641-c3fceab9da63/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU= +github.com/fbm3307/toolchainapi v0.0.0-20251006141716-2be085acfe3e h1:rARVoGmvNigxhZrKK23wKHO26lTkSGDSiiKbmGy2HmY= +github.com/fbm3307/toolchainapi v0.0.0-20251006141716-2be085acfe3e/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= From bb9c6b1a0ea1a465ff18cfda7fe4215e41877ca2 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Wed, 15 Oct 2025 14:53:34 +0530 Subject: [PATCH 3/3] updating api from master 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 1bb99313..d1dd1344 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/codeready-toolchain/member-operator require ( - github.com/codeready-toolchain/api v0.0.0-20250916082953-4ecb3a4645e6 + github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 @@ -128,5 +128,3 @@ require ( go 1.23.0 toolchain go1.23.12 - -replace github.com/codeready-toolchain/api => github.com/fbm3307/toolchainapi v0.0.0-20251006141716-2be085acfe3e diff --git a/go.sum b/go.sum index eb6a17f7..537e2e99 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= +github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd h1:A6WOUwlUdgOf4PDzzgKvycRj4Pk+1F6npWV4YoPVFcM= +github.com/codeready-toolchain/api v0.0.0-20251008084914-06282b83d4cd/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU= github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1 h1:jqs4yOuJbfW3CKe1EMJkkDo47wTKQ4M1OKox4DYWsKg= github.com/codeready-toolchain/toolchain-common v0.0.0-20251006132314-2591ebe0bdb1/go.mod h1:eySMK8JR/Py9eoUJlAkOXqvfPp1vjl39scgrECr99XM= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= @@ -38,8 +40,6 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= -github.com/fbm3307/toolchainapi v0.0.0-20251006141716-2be085acfe3e h1:rARVoGmvNigxhZrKK23wKHO26lTkSGDSiiKbmGy2HmY= -github.com/fbm3307/toolchainapi v0.0.0-20251006141716-2be085acfe3e/go.mod h1:TiQ/yNv3cGL4nxo3fgRtcHyYYuRf+nAgs6B1IAqvxOU= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=