Bug 1868770

This is likely best solved with documentation, and potentially a change to `oc` to mirror the catalog image and suggest the manifests to use.

In 4.6, it would be simplest to not disable the default CatalogSources, and instead set an ImageContentSourcePolicy entry remapping the default `registry.redhat.io` catalog image to your internal `<local-registry>/olm/redhat-operators:latest`

(In reply to Evan Cordell from comment #1)
> This is likely best solved with documentation, and potentially a change to
> `oc` to mirror the catalog image and suggest the manifests to use.
> 
> In 4.6, it would be simplest to not disable the default CatalogSources, and
> instead set an ImageContentSourcePolicy entry remapping the default
> `registry.redhat.io` catalog image to your internal
> `<local-registry>/olm/redhat-operators:latest`

pls note, if I create the catalogSource post deployment (of disconnected cluster) - then it won't be deleted.

ICSP (in a disconnected cluster) must be used anyway.. Not disabling the default --> this method only with full catalog. Pruning it, I won't be able to edit "redhat-operators", and change the image name. (until disabling the default).  right?

btw, why we are not doing this ICSP way (only without disabling the default) in 4.4, 4.5?

When you say this works post deployment, could you be more specific? Are you saying that you're applying this yaml during cluster boostrap?

Yes. I'm applying this during cluster bootstrap.  i.e: I put the catalogSource.yaml in <cluster-dir>/openshift (after openshift-install create manifests). then at some point this catalog is deleted.
After cluster deployment, I can re-apply the yaml, and this time catalog is not deleted

> btw, why we are not doing this ICSP way (only without disabling the default) in 4.4, 4.5?

This is because in 4.4 and 4.5 the default operators weren't backed by pregenerated catalog images at all -- they were pointing to an external endpoint that generated the catalog metadata at runtime.

I'm closing this bug as NOTABUG since the default workflow in 4.6+ doesn't require disabling these sources at all anymore. Docs should reflect this change in 4.6

Cluster version is 4.7.0-0.nightly-2020-11-08-225909

[root@preserve-olm-env data]# oc exec marketplace-operator-574f95d4c5-mvnzw -- marketplace-operator --version
Marketplace source git commit: cc91a681f58587ec7748ec3c1d12142f7e7f8638
time="2020-11-09T03:55:59Z" level=info msg="Go Version: go1.15.2"
time="2020-11-09T03:55:59Z" level=info msg="Go OS/Arch: linux/amd64"
time="2020-11-09T03:55:59Z" level=info msg="operator-sdk Version: v0.8.0"

1, Disable the default CatalogSource resources.
[root@preserve-olm-env data]# oc patch operatorhub cluster -p '{"spec": {"disableAllDefaultSources": true}}' --type=merge
operatorhub.config.openshift.io/cluster patched

2, Create a custom CatalogSource with a default CatalogSource object name.
[root@preserve-olm-env data]# cat cs-redhat.yaml 
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: redhat-operators
  namespace: openshift-marketplace
spec:
  displayName: Red Hat Operators
  icon:
    base64data: ""
    mediatype: ""
  image: quay.io/openshift-qe-optional-operators/ocp4-index:latest
  priority: -100
  publisher: Jian
  sourceType: grpc
  updateStrategy:
    registryPoll:
      interval: 10m0s

[root@preserve-olm-env data]# oc get catalogsource
NAME               DISPLAY             TYPE   PUBLISHER   AGE
redhat-operators   Red Hat Operators   grpc   Jian        8s

[root@preserve-olm-env data]# oc get pods
NAME                                    READY   STATUS              RESTARTS   AGE
marketplace-operator-574f95d4c5-mvnzw   1/1     Running             0          3h37m
redhat-operators-jpcl9                  0/1     ContainerCreating   0          3s

This custom CatalogSource (Publisher is Jian) can be created well.

3, After the default OperatorHub reenabled, the default CatalogSource objects are back. That custom catalog source object is overwide.

[root@preserve-olm-env data]# oc patch operatorhub cluster -p '{"spec": {"disableAllDefaultSources": false}}' --type=merge
operatorhub.config.openshift.io/cluster patched
[root@preserve-olm-env data]# oc get catalogsource
NAME                  DISPLAY               TYPE   PUBLISHER   AGE
certified-operators   Certified Operators   grpc   Red Hat     3s
community-operators   Community Operators   grpc   Red Hat     3s
redhat-marketplace    Red Hat Marketplace   grpc   Red Hat     3s
redhat-operators      Red Hat Operators     grpc   Red Hat     2m14s
[root@preserve-olm-env data]# oc get pods
NAME                                    READY   STATUS    RESTARTS   AGE
certified-operators-5gtnx               0/1     Running   0          10s
community-operators-jl4mz               0/1     Running   0          10s
marketplace-operator-574f95d4c5-gd86v   1/1     Running   0          50m
redhat-marketplace-f55bx                1/1     Running   0          10s
redhat-operators-mxdgd                  0/1     Running   0          10s

LGTM, but just a log output format here: https://github.com/operator-framework/operator-marketplace/pull/361
Verify this bug first.

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 (Moderate: OpenShift Container Platform 4.7.0 security, bug fix, and enhancement update), 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/RHSA-2020:5633