From 9972be05af2ef02f92aa5d45eef853c501d5b86b Mon Sep 17 00:00:00 2001 From: Rajiv Senthilnathan Date: Wed, 25 Feb 2026 12:16:48 -0500 Subject: [PATCH 1/3] Remove unused DurationBeforeChangeTierRequestDeletion config --- go.mod | 4 ++++ go.sum | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 1af939434..c69919edf 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,9 @@ module github.com/codeready-toolchain/toolchain-e2e +replace github.com/codeready-toolchain/api => github.com/rajivnathan/api v0.0.0-20260225164436-80c782ea57de + +replace github.com/codeready-toolchain/toolchain-common => github.com/rajivnathan/toolchain-common v0.0.0-20260225170920-5096cffa010b + require ( github.com/codeready-toolchain/api v0.0.0-20260108115150-4c6695ed18de github.com/codeready-toolchain/toolchain-common v0.0.0-20260108130331-10ca562525fe diff --git a/go.sum b/go.sum index 4f81c4dfd..c84f75ae6 100644 --- a/go.sum +++ b/go.sum @@ -26,10 +26,6 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn 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-20260108115150-4c6695ed18de h1:rc39ZRUk2AyADzH+bt5On7V7qJz6syUrI4qNyCSXY3o= -github.com/codeready-toolchain/api v0.0.0-20260108115150-4c6695ed18de/go.mod h1:O/HyAcz6fynt3LXr8wTGaIXt+0v6BpkiJvDxNQDCqyA= -github.com/codeready-toolchain/toolchain-common v0.0.0-20260108130331-10ca562525fe h1:TOSa/kVCYoLXKX7B/uBLnJsi4Pnaf6nD9K0flumVr6o= -github.com/codeready-toolchain/toolchain-common v0.0.0-20260108130331-10ca562525fe/go.mod h1:rjveL3/1VJeHnDwhvWCEF5jCFRC4xAz93DQp1rKPn3Y= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -230,6 +226,10 @@ github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2 github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= +github.com/rajivnathan/api v0.0.0-20260225164436-80c782ea57de h1:jDu6zVmHfCVKnmKTCmMtvGyACGvE94R09CLHrTVIRA4= +github.com/rajivnathan/api v0.0.0-20260225164436-80c782ea57de/go.mod h1:PMg6kNHuCGNlu3MOdrCisqGkBpvzB0qS1+E6nrXxPAc= +github.com/rajivnathan/toolchain-common v0.0.0-20260225170920-5096cffa010b h1:7PjgTyxd+LeOaeJD3pu5IanpoQEKc8olA3e2pyRpVR8= +github.com/rajivnathan/toolchain-common v0.0.0-20260225170920-5096cffa010b/go.mod h1:fP177rBNtGecNLO7JXFhz6UQVaYMnmofE4HjvTFCtBQ= github.com/redhat-cop/operator-utils v1.3.8 h1:xhoMBg2snSzNdcxT53lSBr7PRXxrzP1cDi51NPBLaT4= github.com/redhat-cop/operator-utils v1.3.8/go.mod h1:s4R0YY8lVlHkC78GLV20PPuZmywjSbTwZKCHwWUQ3P8= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= From 7fb069218deb57f643d288c56de6185250e6b48b Mon Sep 17 00:00:00 2001 From: Rajiv Senthilnathan Date: Thu, 26 Feb 2026 08:29:48 -0500 Subject: [PATCH 2/3] Update deps --- go.mod | 8 ++------ go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 3ad7a4469..cddce10a3 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,8 @@ module github.com/codeready-toolchain/toolchain-e2e -replace github.com/codeready-toolchain/api => github.com/rajivnathan/api v0.0.0-20260225164436-80c782ea57de - -replace github.com/codeready-toolchain/toolchain-common => github.com/rajivnathan/toolchain-common v0.0.0-20260225170920-5096cffa010b - require ( - github.com/codeready-toolchain/api v0.0.0-20260108115150-4c6695ed18de - github.com/codeready-toolchain/toolchain-common v0.0.0-20260225205316-85e4bef507f2 + github.com/codeready-toolchain/api v0.0.0-20260226033043-912fcbd23dc7 + github.com/codeready-toolchain/toolchain-common v0.0.0-20260226040150-d7d5d0163ff7 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/fatih/color v1.18.0 github.com/ghodss/yaml v1.0.0 diff --git a/go.sum b/go.sum index 0c3659654..f6c98eaa1 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,10 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= +github.com/codeready-toolchain/api v0.0.0-20260226033043-912fcbd23dc7 h1:1YCopXDF7WSjhM7sQAFoNeJvoIVPCHDY35jNVqc0Xh4= +github.com/codeready-toolchain/api v0.0.0-20260226033043-912fcbd23dc7/go.mod h1:PMg6kNHuCGNlu3MOdrCisqGkBpvzB0qS1+E6nrXxPAc= +github.com/codeready-toolchain/toolchain-common v0.0.0-20260226040150-d7d5d0163ff7 h1:NLTKW/An6PfcgqUyjeloAl0cmR0/lJopURsMMY/VZcs= +github.com/codeready-toolchain/toolchain-common v0.0.0-20260226040150-d7d5d0163ff7/go.mod h1:TtwbNKTtHxDEaO2fOhJbYM4S1FykJHOf/4/nCw7hFwo= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -226,10 +230,6 @@ github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2 github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= -github.com/rajivnathan/api v0.0.0-20260225164436-80c782ea57de h1:jDu6zVmHfCVKnmKTCmMtvGyACGvE94R09CLHrTVIRA4= -github.com/rajivnathan/api v0.0.0-20260225164436-80c782ea57de/go.mod h1:PMg6kNHuCGNlu3MOdrCisqGkBpvzB0qS1+E6nrXxPAc= -github.com/rajivnathan/toolchain-common v0.0.0-20260225170920-5096cffa010b h1:7PjgTyxd+LeOaeJD3pu5IanpoQEKc8olA3e2pyRpVR8= -github.com/rajivnathan/toolchain-common v0.0.0-20260225170920-5096cffa010b/go.mod h1:fP177rBNtGecNLO7JXFhz6UQVaYMnmofE4HjvTFCtBQ= github.com/redhat-cop/operator-utils v1.3.8 h1:xhoMBg2snSzNdcxT53lSBr7PRXxrzP1cDi51NPBLaT4= github.com/redhat-cop/operator-utils v1.3.8/go.mod h1:s4R0YY8lVlHkC78GLV20PPuZmywjSbTwZKCHwWUQ3P8= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= From bc0f43172079707b623770854546428b5faab7ec Mon Sep 17 00:00:00 2001 From: Rajiv Senthilnathan Date: Thu, 26 Feb 2026 09:23:50 -0500 Subject: [PATCH 3/3] Remove durationBeforeChangeTierRequestDeletion from test config files --- deploy/host-operator/appstudio-e2e/toolchainconfig.yaml | 1 - deploy/host-operator/e2e-tests/toolchainconfig.yaml | 1 - deploy/host-operator/ui-e2e-tests/toolchainconfig.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/deploy/host-operator/appstudio-e2e/toolchainconfig.yaml b/deploy/host-operator/appstudio-e2e/toolchainconfig.yaml index 7b48e2700..eaa2eafb1 100644 --- a/deploy/host-operator/appstudio-e2e/toolchainconfig.yaml +++ b/deploy/host-operator/appstudio-e2e/toolchainconfig.yaml @@ -7,7 +7,6 @@ spec: tiers: defaultTier: 'appstudio' defaultSpaceTier: 'appstudio' - durationBeforeChangeTierRequestDeletion: '5s' automaticApproval: enabled: true deactivation: diff --git a/deploy/host-operator/e2e-tests/toolchainconfig.yaml b/deploy/host-operator/e2e-tests/toolchainconfig.yaml index d491b6246..127b39888 100644 --- a/deploy/host-operator/e2e-tests/toolchainconfig.yaml +++ b/deploy/host-operator/e2e-tests/toolchainconfig.yaml @@ -30,7 +30,6 @@ spec: spaceRequestEnabled: true spaceBindingRequestEnabled: true tiers: - durationBeforeChangeTierRequestDeletion: '5s' defaultSpaceTier: 'base1ns' featureToggles: - name: "test-feature" diff --git a/deploy/host-operator/ui-e2e-tests/toolchainconfig.yaml b/deploy/host-operator/ui-e2e-tests/toolchainconfig.yaml index 46a0e7d9a..a23df2e34 100644 --- a/deploy/host-operator/ui-e2e-tests/toolchainconfig.yaml +++ b/deploy/host-operator/ui-e2e-tests/toolchainconfig.yaml @@ -32,7 +32,6 @@ spec: spaceRequestEnabled: true spaceBindingRequestEnabled: true tiers: - durationBeforeChangeTierRequestDeletion: "5s" defaultSpaceTier: "base1ns" featureToggles: - name: "test-feature"