Description of problem: ose-cluster-svcat-apiserver-operator-container ose-cluster-svcat-controller-manager-operator-container were removed from 4.5 and need to be added back in.
These images contain the service catalog removal jobs used to remove service catalog during 4.5 upgrades.
Yes, thanks! The rc.7 also has the 2 images, as follows: For the image test: [root@preserve-olm-env data]# oc adm release info registry.svc.ci.openshift.org/ocp/release:4.5.0-0.nightly-2020-07-07-130943 |grep svcat cluster-svcat-apiserver-operator sha256:d6de058aca970acbff2530afd8f617a06200cf65cac4775b3219fc33b1a47842 cluster-svcat-controller-manager-operator sha256:bc05167f1b911859e8458b02460d3205e52200ea08cdbf1ce7ad7b84e0ece10e [root@preserve-olm-env data]# oc adm release info quay.io/openshift-release-dev/ocp-release:4.5.0-rc.7-x86_64 |grep svcat cluster-svcat-apiserver-operator sha256:d6de058aca970acbff2530afd8f617a06200cf65cac4775b3219fc33b1a47842 cluster-svcat-controller-manager-operator sha256:bc05167f1b911859e8458b02460d3205e52200ea08cdbf1ce7ad7b84e0ece10e For the upgrade test: 1) Upgrade without --force. 1, Enable the ServiceCatalog on 4.4.11. mac:~ jianzhang$ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.4.11 True False 9m19s Cluster version is 4.4.11 mac:~ jianzhang$ oc get servicecatalogapiserver NAME AGE cluster 29m mac:~ jianzhang$ oc get clusterservicebroker NAME URL STATUS AGE template-service-broker https://apiserver.openshift-template-service-broker.svc:443/brokers/template.openshift.io Ready 5m 2, Disable the ServiceCatalog. mac:~ jianzhang$ oc patch servicecatalogapiserver cluster -p '{"spec":{"managementState":"Removed"}}' --type=merge servicecatalogapiserver.operator.openshift.io/cluster patched mac:~ jianzhang$ oc patch servicecatalogcontrollermanager cluster -p '{"spec":{"managementState":"Removed"}}' --type=merge servicecatalogcontrollermanager.operator.openshift.io/cluster patched mac:~ jianzhang$ oc get clusterservicebroker Error from server (NotFound): Unable to list "servicecatalog.k8s.io/v1beta1, Resource=clusterservicebrokers": the server could not find the requested resource (get clusterservicebrokers.servicecatalog.k8s.io) 3, Upgrade it to the 4.5.0-rc.7 without the `--force`. mac:~ jianzhang$ oc adm upgrade --to-image=quay.io/openshift-release-dev/ocp-release@sha256:f284efc07cb0bfa06cb7260ce4dedff4dabb55002377a7bcc637b58730976a3f --allow-explicit-upgrade warning: The requested upgrade image is not one of the available updates. You have used --allow-explicit-upgrade to the update to preceed anyway Updating to release image quay.io/openshift-release-dev/ocp-release@sha256:f284efc07cb0bfa06cb7260ce4dedff4dabb55002377a7bcc637b58730976a3f mac:~ jianzhang$ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.4.11 True True 41s Working towards 4.5.0-rc.7: 11% complete mac:~ jianzhang$ oc get job -A NAMESPACE NAME COMPLETIONS DURATION AGE openshift-cluster-version version--76gxn 1/1 7s 37m mac:~ jianzhang$ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.5.0-rc.7 True False 44m Cluster version is 4.5.0-rc.7 4, Check if the ServiceCatalog removed. I can see the removed Jobs. mac:~ jianzhang$ oc project openshift-service-catalog-removed Now using project "openshift-service-catalog-removed" on server "https://api.qe-jiazha-09.qe.devcluster.openshift.com:6443". mac:~ jianzhang$ oc get job NAME COMPLETIONS DURATION AGE openshift-service-catalog-apiserver-remover 1/1 6s 66m openshift-service-catalog-controller-manager-remover 1/1 6s 66m mac:~ jianzhang$ oc get pods NAME READY STATUS RESTARTS AGE openshift-service-catalog-apiserver-remover-8f6st 0/1 Completed 0 65m openshift-service-catalog-controller-manager-remover-977w6 0/1 Completed 0 64m But, the ServiceCatalog CRDs still exists. This is not a release block issue, I create bug 1854978 for the dev confirmation. mac:~ jianzhang$ oc get servicecatalogapiserver No resources found mac:~ jianzhang$ oc get crd servicecatalogapiservers.operator.openshift.io NAME CREATED AT servicecatalogapiservers.operator.openshift.io 2020-07-08T11:47:09Z mac:~ jianzhang$ oc get crd servicecatalogcontrollermanagers.operator.openshift.io NAME CREATED AT servicecatalogcontrollermanagers.operator.openshift.io 2020-07-08T11:47:09Z 2) Upgrade with --force [root@preserve-olm-env data]# oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.4.11 True False 43m Cluster version is 4.4.11 [root@preserve-olm-env data]# oc get servicecatalogapiserver NAME AGE cluster 70m [root@preserve-olm-env data]# oc get clusterservicebroker NAME URL STATUS AGE template-service-broker https://apiserver.openshift-template-service-broker.svc:443/brokers/template.openshift.io Ready 38m ServiceCcatalog will block the normal upgrade. [root@preserve-olm-env data]# oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.4.11 True True 82s Unable to apply quay.io/openshift-release-dev/ocp-release@sha256:f284efc07cb0bfa06cb7260ce4dedff4dabb55002377a7bcc637b58730976a3f: it may not be safe to apply this update Force upgrade it. [root@preserve-olm-env data]# oc adm upgrade --to-image=quay.io/openshift-release-dev/ocp-release@sha256:f284efc07cb0bfa06cb7260ce4dedff4dabb55002377a7bcc637b58730976a3f --allow-explicit-upgrade --force=true --allow-upgrade-with-warnings warning: The requested upgrade image is not one of the available updates. You have used --allow-explicit-upgrade to the update to preceed anyway warning: ... The ServiceCatalog still exist, but, its version still is 4.4.11, looks good. [root@preserve-olm-env data]# oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS version 4.5.0-rc.7 True False 3m5s Cluster version is 4.5.0-rc.7 [root@preserve-olm-env data]# oc get servicecatalogapiserver NAME AGE cluster 123m [root@preserve-olm-env data]# oc get clusterservicebroker NAME URL STATUS AGE template-service-broker https://apiserver.openshift-template-service-broker.svc:443/brokers/template.openshift.io Ready 1h [root@preserve-olm-env data]# oc get co |grep service-catalog service-catalog-apiserver 4.4.11 True False False 19m service-catalog-controller-manager 4.4.11 True False False 19m For this bug, LGTM, verify it.
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHBA-2020:2409