diff --git a/blocked-edges/4.2.0-rc.5.yaml b/blocked-edges/4.2.0-rc.5.yaml deleted file mode 100644 index 52fa8fe39..000000000 --- a/blocked-edges/4.2.0-rc.5.yaml +++ /dev/null @@ -1,2 +0,0 @@ -to: 4.2.0-rc.5 -from: 4\.1\.(18|20) diff --git a/blocked-edges/4.2.22.yaml b/blocked-edges/4.2.22.yaml index d5940b25a..e5307d736 100644 --- a/blocked-edges/4.2.22.yaml +++ b/blocked-edges/4.2.22.yaml @@ -3,6 +3,6 @@ # condition reported in the linked bz, and only be recoverable by # manual service ca rotation. # -# Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 +# Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 to: 4.2.22 from: .* diff --git a/blocked-edges/4.2.23.yaml b/blocked-edges/4.2.23.yaml new file mode 100644 index 000000000..f0a00a0ee --- /dev/null +++ b/blocked-edges/4.2.23.yaml @@ -0,0 +1,8 @@ +# Upgrading any release to 4.2.23 will enable automated service ca +# rotation without unique ca serial numbers. This will result in +# condition reported in the linked bz, and only be recoverable by +# manual service ca rotation. +# +# Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 +to: 4.2.23 +from: .* diff --git a/blocked-edges/4.3.0-rc.0.yaml b/blocked-edges/4.3.0-rc.0.yaml deleted file mode 100644 index 0a24a299d..000000000 --- a/blocked-edges/4.3.0-rc.0.yaml +++ /dev/null @@ -1,7 +0,0 @@ -to: 4.3.0-rc.0 -from: .* -# 4.2 -> 4.3 updates occasionally hit FailedCreatePodSandBox events, fixed in rc.3, but in neither 4.2.16 nor rc.0: https://bugzilla.redhat.com/show_bug.cgi?id=1787635 -# 4.2 -> 4.3 updates occasionally hit RequiredPoolsFailed degradation, fixed in 4.2.16 and rc.3, but in neither 4.2.13 nor rc.0: https://bugzilla.redhat.com/show_bug.cgi?id=1786993 -# 4.2 -> 4.3 updates occasionally hit RequiredPoolsFailed degradation, fixed in 4.2.18 and rc.0, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1782152 https://bugzilla.redhat.com/show_bug.cgi?id=1782149 -# 4.2 -> 4.3 updates occasionally hit RouteHealthDegraded degradation, fixed in rc.0, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1790704 -# 4.2 -> 4.3 updates on GCP occasionally have unreachable workloads: https://bugzilla.redhat.com/show_bug.cgi?id=1793635 diff --git a/blocked-edges/4.3.0-rc.3.yaml b/blocked-edges/4.3.0-rc.3.yaml deleted file mode 100644 index 76d3d9ff8..000000000 --- a/blocked-edges/4.3.0-rc.3.yaml +++ /dev/null @@ -1,6 +0,0 @@ -to: 4.3.0-rc.3 -from: 4\.2\..* -# 4.2 -> 4.3 updates occasionally hit FailedCreatePodSandBox events, fixed in rc.3, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1787635 -# 4.2 -> 4.3 updates occasionally hit RequiredPoolsFailed degradation, fixed in 4.2.18 and rc.0, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1782152 https://bugzilla.redhat.com/show_bug.cgi?id=1782149 -# 4.2 -> 4.3 updates occasionally hit RouteHealthDegraded degradation, fixed in rc.0, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1790704 -# 4.2 -> 4.3 updates on GCP occasionally have unreachable workloads: https://bugzilla.redhat.com/show_bug.cgi?id=1793635 diff --git a/blocked-edges/4.3.5.yaml b/blocked-edges/4.3.5.yaml index 3dbe8f041..eb7e7f9ce 100644 --- a/blocked-edges/4.3.5.yaml +++ b/blocked-edges/4.3.5.yaml @@ -3,6 +3,8 @@ # condition reported in the linked bz, and only be recoverable by # manual service ca rotation. # -# Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 +# Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 +# +# Also includes broken OAuth service cert rotation: https://bugzilla.redhat.com/show_bug.cgi?id=1801573 to: 4.3.5 from: .* diff --git a/channels/candidate-4.2.yaml b/channels/candidate-4.2.yaml index ed1f89de7..1542ef4e9 100644 --- a/channels/candidate-4.2.yaml +++ b/channels/candidate-4.2.yaml @@ -52,3 +52,4 @@ versions: - 4.2.21 - 4.2.22 - 4.2.23 +# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 diff --git a/channels/candidate-4.3.yaml b/channels/candidate-4.3.yaml index b7cc469c7..c0d7169e4 100644 --- a/channels/candidate-4.3.yaml +++ b/channels/candidate-4.3.yaml @@ -10,6 +10,7 @@ versions: - 4.2.21+amd64 - 4.2.22+amd64 - 4.2.23+amd64 +# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 - 4.3.0-rc.0 # I'm not sure what happened to rc1 and rc2. rc2 was, I think, fine # but it never got upgrade tests https://github.com/openshift/cincinnati-graph-data/pull/26 @@ -21,3 +22,4 @@ versions: # No 4.3.4 because of https://bugzilla.redhat.com/show_bug.cgi?id=1805726 - 4.3.5 # No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886 +# No 4.3.7 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 diff --git a/channels/candidate-4.4.yaml b/channels/candidate-4.4.yaml index be89b8416..ca223eb45 100644 --- a/channels/candidate-4.4.yaml +++ b/channels/candidate-4.4.yaml @@ -1,4 +1,7 @@ name: candidate-4.4 versions: - 4.3.5 +# No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886 +# No 4.3.7 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 - 4.4.0-rc.0 +- 4.4.0-rc.1 diff --git a/channels/fast-4.2.yaml b/channels/fast-4.2.yaml index e6c3e93aa..6ca3eb946 100644 --- a/channels/fast-4.2.yaml +++ b/channels/fast-4.2.yaml @@ -44,3 +44,5 @@ versions: - 4.2.20 - 4.2.21 - 4.2.22 +- 4.2.23 +# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 diff --git a/channels/fast-4.3.yaml b/channels/fast-4.3.yaml index 52be4a5e1..4fc08f4d2 100644 --- a/channels/fast-4.3.yaml +++ b/channels/fast-4.3.yaml @@ -9,6 +9,8 @@ versions: - 4.2.20+amd64 - 4.2.21+amd64 - 4.2.22+amd64 +- 4.2.23+amd64 +# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 - 4.3.0 - 4.3.1 # Upgrade edges disabled for 4.3.2 and 4.3.3 because of bugs https://bugzilla.redhat.com/show_bug.cgi?id=1802248, https://bugzilla.redhat.com/show_bug.cgi?id=1805444, https://bugzilla.redhat.com/show_bug.cgi?id=1808429 @@ -17,3 +19,4 @@ versions: # No 4.3.4 because of https://bugzilla.redhat.com/show_bug.cgi?id=1805726 - 4.3.5 # No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886 +# No 4.3.7 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 diff --git a/channels/stable-4.2.yaml b/channels/stable-4.2.yaml index 44d51196a..230c3ea55 100644 --- a/channels/stable-4.2.yaml +++ b/channels/stable-4.2.yaml @@ -41,3 +41,5 @@ versions: - 4.2.20 - 4.2.21 - 4.2.22 +- 4.2.23 +# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 diff --git a/channels/stable-4.3.yaml b/channels/stable-4.3.yaml index 11d5b826c..f37d8cda8 100644 --- a/channels/stable-4.3.yaml +++ b/channels/stable-4.3.yaml @@ -7,6 +7,8 @@ versions: - 4.2.20+amd64 - 4.2.21+amd64 - 4.2.22+amd64 +- 4.2.23+amd64 +# No 4.2.24 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573 # until s390 is released on 4.3 we may not want to include it in 4.3 channels # 4.2 -> 4.3 updates occasionally hit RequiredPoolsFailed, fixed in 4.2.18 and rc.0, but not in 4.2.16: https://bugzilla.redhat.com/show_bug.cgi?id=1782152 https://bugzilla.redhat.com/show_bug.cgi?id=1782149 # not 4.2.17 because we had a long quiet time after 4.2.16 with no releases @@ -17,5 +19,6 @@ versions: - 4.3.2 - 4.3.3 # No 4.3.4 because of https://bugzilla.redhat.com/show_bug.cgi?id=1805726 -# No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886 - 4.3.5 +# No 4.3.6 because of https://bugzilla.redhat.com/show_bug.cgi?id=1811886 +# No 4.3.7 because of the service CA rotation issue: https://bugzilla.redhat.com/show_bug.cgi?id=1810036 https://bugzilla.redhat.com/show_bug.cgi?id=1801573