Skip to content

Commit 519c545

Browse files
committed
OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
1 parent 3183f7f commit 519c545

6 files changed

+15
-15
lines changed

modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ metadata:
3434
namespace: operator-namspace
3535
# ...
3636
spec:
37-
source: redhat-operators-v2 <1>
37+
source: redhat-operators-disconnected-v2 <1>
3838
# ...
3939
----
4040
<1> Enter the name of the additional catalog source configuration that you defined in the `{policy-gen-cr}` resource.

modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ ifeval::["{policy-gen-cr}" == "PolicyGenerator"]
2929
include::snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc[]
3030
endif::[]
3131
32-
.. This update generates one policy, `du-upgrade-operator-catsrc-policy`, to update the `redhat-operators` catalog source with the new index images that contain the desired Operators images.
32+
.. This update generates one policy, `du-upgrade-operator-catsrc-policy`, to update the `redhat-operators-disconnected` catalog source with the new index images that contain the desired Operators images.
3333
+
3434
[NOTE]
3535
====
36-
If you want to use the image pre-caching for Operators and there are Operators from a different catalog source other than `redhat-operators`, you must perform the following tasks:
36+
If you want to use the image pre-caching for Operators and there are Operators from a different catalog source other than `redhat-operators-disconnected`, you must perform the following tasks:
3737
3838
* Prepare a separate catalog source policy with the new index image or registry poll interval update for the different catalog source.
3939
* Prepare a separate subscription policy for the desired Operators that are from the different catalog source.

snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ manifests:
44
- path: source-crs/DefaultCatsrc.yaml
55
patches:
66
- metadata:
7-
name: redhat-operators
7+
name: redhat-operators-disconnected
88
spec:
99
displayName: Red Hat Operators Catalog
10-
image: registry.example.com:5000/olm/redhat-operators:v{product-version}
10+
image: registry.example.com:5000/olm/redhat-operators-disconnected:v{product-version}
1111
updateStrategy:
1212
registryPoll:
1313
interval: 1h
@@ -17,10 +17,10 @@ manifests:
1717
- path: source-crs/DefaultCatsrc.yaml
1818
patches:
1919
- metadata:
20-
name: redhat-operators-v2 <1>
20+
name: redhat-operators-disconnected-v2 <1>
2121
spec:
2222
displayName: Red Hat Operators Catalog v2 <2>
23-
image: registry.example.com:5000/olredhat-operators:<version> <3>
23+
image: registry.example.com:5000/olm/redhat-operators-disconnected:<version> <3>
2424
updateStrategy:
2525
registryPoll:
2626
interval: 1h

snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ policies:
3232
- path: source-crs/DefaultCatsrc.yaml
3333
patches:
3434
- metadata:
35-
name: redhat-operators
35+
name: redhat-operators-disconnected
3636
spec:
3737
displayName: Red Hat Operators Catalog
38-
image: registry.example.com:5000/olm/redhat-operators:v{product-version} <1>
38+
image: registry.example.com:5000/olm/redhat-operators-disconnected:v{product-version} <1>
3939
updateStrategy: <2>
4040
registryPoll:
4141
interval: 1h

snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
remediationAction: inform
66
policyName: "operator-catsrc-policy"
77
metadata:
8-
name: redhat-operators
8+
name: redhat-operators-disconnected
99
spec:
1010
displayName: Red Hat Operators Catalog
11-
image: registry.example.com:5000/olm/redhat-operators:v{product-version}
11+
image: registry.example.com:5000/olm/redhat-operators-disconnected:v{product-version}
1212
updateStrategy:
1313
registryPoll:
1414
interval: 1h
@@ -19,10 +19,10 @@
1919
remediationAction: inform
2020
policyName: "operator-catsrc-policy"
2121
metadata:
22-
name: redhat-operators-v2 <1>
22+
name: redhat-operators-disconnected-v2 <1>
2323
spec:
2424
displayName: Red Hat Operators Catalog v2 <2>
25-
image: registry.example.com:5000/olredhat-operators:<version> <3>
25+
image: registry.example.com:5000/olm/redhat-operators-disconnected:<version> <3>
2626
updateStrategy:
2727
registryPoll:
2828
interval: 1h

snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ spec:
1616
remediationAction: inform
1717
policyName: "operator-catsrc-policy"
1818
metadata:
19-
name: redhat-operators
19+
name: redhat-operators-disconnected
2020
spec:
2121
displayName: Red Hat Operators Catalog
22-
image: registry.example.com:5000/olm/redhat-operators:v{product-version} <1>
22+
image: registry.example.com:5000/olm/redhat-operators-disconnected:v{product-version} <1>
2323
updateStrategy: <2>
2424
registryPoll:
2525
interval: 1h

0 commit comments

Comments
 (0)