Commit 586001f
committed
Dockerfile: Shift ConsolePlugin CRD after the operator Deployment
Removing the explicit 0000_10_ runlevel will allow these resources to
go in with the other console resources in the default runlevel 50
[1,2]. I'm prefixing ConsolePlugin with '08-a' sort it after
07-operator.yaml [3], because the operator is what serves the
/crdconvert webhook defined in that CRD [4], but to sort it before
08-clusteroperator.yaml, to avoid [5]:
level=error msg=Cluster operator console Available is False with RouteHealth_FailedLoadCA: RouteHealthAvailable: failed to read CA to check route health: configmaps "trusted-ca-bundle" not found
although I'm not entirely clear on why that trusted-ca-bundle issue
would be related to the positioning of the ConsolePlugin CRD. Still,
even without a clear relationship, console operator health might
depend on having the CRD in place, so positioning between the
Deployment and the ClusterOperator seems safest.
This is a part of what shifted in openshift/api@9e3e820a70 (Console
CRDs: Rename files to use the default run-level for updates,
2023-08-02, openshift/api#1541), but pulled back to 4.12 to address
the 4.11-to-4.12 update race [4]. We don't need to patch 4.13 or
later this way, because for 4.12-to-4.13 and later updates, the
console deployment is already serving the conversion webhook. And
because this is a one-off just for 4.12.z, I'm using the expanded-COPY
hack instead of updating the API and vendor-bumping like we're doing
in [6] for the development branch.
[1]: https://github.com/openshift/enhancements/blob/cafeb5c3cba7f8c9e261b2aabffa92e34dd76be6/dev-guide/cluster-version-operator/dev/operators.md#what-is-the-order-that-resources-get-createdupdated-in
[2]: https://github.com/openshift/oc/blob/13225e00caf1ad2d3603e1d1cc8651833f2effcb/pkg/cli/admin/release/new.go#L1412-L1416
[3]: https://github.com/openshift/console-operator/blob/cb08a319271b2f4676d1faae96a5ab10440facb0/manifests/07-operator.yaml
[4]: https://issues.redhat.com/browse/OCPBUGS-15834
[5]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_console-operator/791/pull-ci-openshift-console-operator-release-4.12-e2e-gcp-ovn/1699372255974264832#1:build-log.txt%3A6648
[6]: #7821 parent 653ebbc commit 586001f
1 file changed
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
21 | 26 | | |
22 | 27 | | |
23 | 28 | | |
| |||
0 commit comments