From c93543f7561b553cb8b3549f1722b7e0ffb9b6a0 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 3 Aug 2023 15:28:06 -0700 Subject: [PATCH] manifests/09-console-link-*: Drop obsolete deletion manifests Since these manifests became deletion manifests in 6c6c5ce5f6 (Add release.openshift.io/delete annotation to consoleLink CRDs, 2021-07-15, #565, 4.9 [1]), the only change has been 0f860bb07a (Add console capability to all manifests in manifests/ and quickstarts/, 2022-07-26, #665). We can remove these deletion references now, because a 4.8 cluster that might have included these resources should have completed an update to 4.9 which would have removed them. And if that failed, they should have completed an update to one of the later 4.y and removed the resources. By removing the resource, we save the cluster-version operator some time checking to ensure deletion, and only expose ourselves to leaking the resources on clusters that updated from 4.8 through to 4.14 without ever having completed an update before reaching 4.14. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1980531#c8 --- manifests/09-console-link-openshift-blog.yaml | 14 -------------- .../09-console-link-openshift-learning-portal.yaml | 14 -------------- 2 files changed, 28 deletions(-) delete mode 100644 manifests/09-console-link-openshift-blog.yaml delete mode 100644 manifests/09-console-link-openshift-learning-portal.yaml diff --git a/manifests/09-console-link-openshift-blog.yaml b/manifests/09-console-link-openshift-blog.yaml deleted file mode 100644 index 9a9a83b64..000000000 --- a/manifests/09-console-link-openshift-blog.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: openshift-blog - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - include.release.openshift.io/single-node-developer: "true" - release.openshift.io/delete: "true" - capability.openshift.io/name: Console -spec: - href: 'https://blog.openshift.com' - location: HelpMenu - text: OpenShift Blog diff --git a/manifests/09-console-link-openshift-learning-portal.yaml b/manifests/09-console-link-openshift-learning-portal.yaml deleted file mode 100644 index 68324a859..000000000 --- a/manifests/09-console-link-openshift-learning-portal.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: console.openshift.io/v1 -kind: ConsoleLink -metadata: - name: openshift-learning-portal - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - include.release.openshift.io/single-node-developer: "true" - release.openshift.io/delete: "true" - capability.openshift.io/name: Console -spec: - href: 'https://learn.openshift.com/?ref=webconsole' - location: HelpMenu - text: Learning Portal