Skip to content

Commit f228fec

Browse files
author
Afreen Rahman
committed
Disable default redhat-operators catalog source
- allow odf plugin enabled by default - csi addon operator requires redhat-operators catalog source
1 parent 6414b31 commit f228fec

2 files changed

Lines changed: 29 additions & 2 deletions

File tree

install-ocs.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
install_ocs() {
44
echo "Updating the pull secret..."
55

6+
oc patch operatorhubs/cluster --type merge --patch '{"spec":{"sources":[{"disabled": true,"name": "redhat-operators"}]}}'
7+
68
oc get -n openshift-config secret/pull-secret -ojson | jq -r '.data.".dockerconfigjson"' | base64 -d | jq > secret.json
79
jq --arg secret $ODF_PULL_SECRET '.auths."quay.io"={auth: $secret, email: ""}' secret.json > temp-secret.json
810
oc set data secret/pull-secret -n openshift-config --from-file=.dockerconfigjson=temp-secret.json
@@ -19,14 +21,14 @@ install_ocs() {
1921
metadata:
2022
labels:
2123
odf-operator-internal: "true"
22-
name: odf-catalogsource
24+
name: redhat-operators
2325
namespace: openshift-marketplace
2426
spec:
2527
displayName: OpenShift Data Foundation
2628
icon:
2729
base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
2830
mediatype: image/svg+xml
29-
image: quay.io/rhceph-dev/ocs-registry:latest-stable-4.10
31+
image: quay.io/afrahman/odf-operator-catalog:latest
3032
publisher: Red Hat
3133
sourceType: grpc
3234
EOF

redhat-src-catalog.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: openshift-local-storage
5+
---
6+
apiVersion: operators.coreos.com/v1alpha2
7+
kind: OperatorGroup
8+
metadata:
9+
name: local-operator-group
10+
namespace: openshift-local-storage
11+
spec:
12+
targetNamespaces:
13+
- openshift-local-storage
14+
---
15+
apiVersion: operators.coreos.com/v1alpha1
16+
kind: Subscription
17+
metadata:
18+
name: local-storage-operator
19+
namespace: openshift-local-storage
20+
spec:
21+
channel: "4.9"
22+
installPlanApproval: Automatic
23+
name: local-storage-operator
24+
source: redhat-operators
25+
sourceNamespace: openshift-marketplace

0 commit comments

Comments
 (0)