From 63594b5dba64681127b9d46726fb46db1d8af247 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 27 Oct 2021 13:18:19 -0400 Subject: [PATCH] Apply 4.6 EOL feeder changes Per the OpenShift Life Cycle document 4.6 maintains the previously defined life cycle which ended non-eus support when 4.9 went GA. As such additional 4.6.z will only be added to eus-4.6 channel. https://access.redhat.com/support/policy/updates/openshift --- channels/eus-4.6.yaml | 7 +++---- channels/stable-4.6.yaml | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/channels/eus-4.6.yaml b/channels/eus-4.6.yaml index 3d1f777eb..6eab4c4f4 100644 --- a/channels/eus-4.6.yaml +++ b/channels/eus-4.6.yaml @@ -1,7 +1,6 @@ -feeder: - delay: PT0H - filter: 4\.6\.[0-9]+(.*hotfix.*)? - name: stable-4.6 +-feeder: + delay: P1W + name: fast-4.6 name: eus-4.6 versions: - 4.6.1 diff --git a/channels/stable-4.6.yaml b/channels/stable-4.6.yaml index f67fc87d1..22da7aaf5 100644 --- a/channels/stable-4.6.yaml +++ b/channels/stable-4.6.yaml @@ -1,6 +1,3 @@ -feeder: - delay: P1W - name: fast-4.6 name: stable-4.6 versions: - 4.5.0-0.hotfix-2020-08-24-185832