From 30fba81ae52105d966aa1d9d489ccfec4a33a7f9 Mon Sep 17 00:00:00 2001 From: German Parente Date: Wed, 29 Apr 2026 10:01:30 +0200 Subject: [PATCH 1/5] Drop 4.15.63 tombstoned release from candidate channels --- channels/candidate-4.15.yaml | 1 - channels/candidate-4.16.yaml | 1 - internal-channels/candidate.yaml | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/channels/candidate-4.15.yaml b/channels/candidate-4.15.yaml index 7edef52b7..613d331f9 100644 --- a/channels/candidate-4.15.yaml +++ b/channels/candidate-4.15.yaml @@ -153,4 +153,3 @@ versions: - 4.15.60 - 4.15.61 - 4.15.62 -- 4.15.63 diff --git a/channels/candidate-4.16.yaml b/channels/candidate-4.16.yaml index 5f873bfd6..f12af7afc 100644 --- a/channels/candidate-4.16.yaml +++ b/channels/candidate-4.16.yaml @@ -153,7 +153,6 @@ versions: - 4.15.60 - 4.15.61 - 4.15.62 -- 4.15.63 - 4.16.0 - 4.16.0-ec.0 - 4.16.0-ec.1 diff --git a/internal-channels/candidate.yaml b/internal-channels/candidate.yaml index 92f30a118..869415249 100644 --- a/internal-channels/candidate.yaml +++ b/internal-channels/candidate.yaml @@ -112,6 +112,8 @@ tombstones: - 4.20.9 # 4.14.64 fails updates from 4.14 with "host must be a URL or a host:port pair", https://redhat.atlassian.net/browse/OCPBUGS-84184 - 4.14.64 +# 4.15.63 contains regressions due to golang CVE-2026-25679 +- 4.15.63 versions: - 4.5.0-0.hotfix-2020-08-24-185832 - 4.5.0-0.hotfix-2020-11-28-021842 @@ -1773,5 +1775,4 @@ versions: - 4.19.29 - 4.21.12 - 4.16.60 -- 4.15.63 -- 4.22.0-rc.1 \ No newline at end of file +- 4.22.0-rc.1 From 6f17f0f9d18862e2f47f80ff9d644b8199950d4e Mon Sep 17 00:00:00 2001 From: German Parente Date: Mon, 4 May 2026 09:44:54 +0200 Subject: [PATCH 2/5] don't drop from channel --- channels/candidate-4.15.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/candidate-4.15.yaml b/channels/candidate-4.15.yaml index 613d331f9..7edef52b7 100644 --- a/channels/candidate-4.15.yaml +++ b/channels/candidate-4.15.yaml @@ -153,3 +153,4 @@ versions: - 4.15.60 - 4.15.61 - 4.15.62 +- 4.15.63 From ebaf8ea38f1bb4a43a6e365ed8598895fdfe8b65 Mon Sep 17 00:00:00 2001 From: German Parente Date: Mon, 4 May 2026 09:45:24 +0200 Subject: [PATCH 3/5] Update candidate-4.16.yaml --- channels/candidate-4.16.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/candidate-4.16.yaml b/channels/candidate-4.16.yaml index f12af7afc..5f873bfd6 100644 --- a/channels/candidate-4.16.yaml +++ b/channels/candidate-4.16.yaml @@ -153,6 +153,7 @@ versions: - 4.15.60 - 4.15.61 - 4.15.62 +- 4.15.63 - 4.16.0 - 4.16.0-ec.0 - 4.16.0-ec.1 From e0d1f1e420dcb4f01c94a9b03f2abe7cd6f56c17 Mon Sep 17 00:00:00 2001 From: German Parente Date: Wed, 6 May 2026 09:59:48 +0200 Subject: [PATCH 4/5] Update candidate.yaml --- internal-channels/candidate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/internal-channels/candidate.yaml b/internal-channels/candidate.yaml index e83b1c245..efe9a3208 100644 --- a/internal-channels/candidate.yaml +++ b/internal-channels/candidate.yaml @@ -1775,6 +1775,7 @@ versions: - 4.19.29 - 4.21.12 - 4.16.60 + - 4.22.0-rc.1 - 4.20.20 - 4.22.0-rc.2 From aa6403e1f76ced6a618b9a479d076be7e6dfed0e Mon Sep 17 00:00:00 2001 From: German Parente Date: Wed, 6 May 2026 10:02:54 +0200 Subject: [PATCH 5/5] Update candidate.yaml --- internal-channels/candidate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal-channels/candidate.yaml b/internal-channels/candidate.yaml index efe9a3208..866302972 100644 --- a/internal-channels/candidate.yaml +++ b/internal-channels/candidate.yaml @@ -1775,7 +1775,7 @@ versions: - 4.19.29 - 4.21.12 - 4.16.60 - +- 4.15.63 - 4.22.0-rc.1 - 4.20.20 - 4.22.0-rc.2