Skip to content

USHIFT-3169: Use RH's Community Operators instead of OperatorHub.io #3363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2024
Merged

USHIFT-3169: Use RH's Community Operators instead of OperatorHub.io #3363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/assets/olm/catalog-source.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: operatorhubio-catalog
name: redhat-community-catalog
namespace: openshift-marketplace
spec:
sourceType: grpc
image: quay.io/operatorhubio/catalog:latest
displayName: Community Operators
publisher: OperatorHub.io
image: registry.redhat.io/redhat/community-operator-index:v4.16
displayName: Red Hat Community Operators
publisher: Red Hat
grpcPodConfig:
securityContextConfig: restricted
updateStrategy:
Expand Down
2 changes: 1 addition & 1 deletion test/assets/olm/subscription-cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ metadata:
spec:
channel: stable
name: cert-manager
source: operatorhubio-catalog
source: redhat-community-catalog
sourceNamespace: openshift-marketplace
14 changes: 7 additions & 7 deletions test/suites/optional/olm.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Deploy CertManager From OperatorHubIO
[Documentation] Deploy CertManager from OperatorHub Catalog.
[Setup] Run Keywords
... OLM Should Be Ready
... Create OperatorHub CatalogSource
... Create CatalogSource
... Create CertManager Subscription

${csv}= Get CSV Name From Subscription ${OPERATORS_NAMESPACE} my-cert-manager
Expand All @@ -30,7 +30,7 @@ Deploy CertManager From OperatorHubIO
Wait For Deployments ${OPERATORS_NAMESPACE} @{deployments}

[Teardown] Run Keywords
... Delete OperatorHub CatalogSource
... Delete CatalogSource
... AND
... Delete CertManager Subscription
... AND
Expand All @@ -57,11 +57,11 @@ OLM Should Be Ready
Named Deployment Should Be Available catalog-operator openshift-operator-lifecycle-manager
Named Deployment Should Be Available olm-operator openshift-operator-lifecycle-manager

Create OperatorHub CatalogSource
[Documentation] Create CatalogSource resource pointing to OperatorHub.io catalog.
Create CatalogSource
[Documentation] Create CatalogSource resource with Red Hat Community Catalog Index.
Oc Create -f ${CATALOG_SOURCE}
Wait Until Keyword Succeeds 120s 5s
... CatalogSource Should Be Ready ${MARKETPLACE_NAMESPACE} operatorhubio-catalog
... CatalogSource Should Be Ready ${MARKETPLACE_NAMESPACE} redhat-community-catalog

CatalogSource Should Be Ready
[Documentation] Checks if CatalogSource is ready.
Expand Down Expand Up @@ -118,8 +118,8 @@ Wait For Deployments
Named Deployment Should Be Available ${deploy} ${namespace} 120s
END

Delete OperatorHub CatalogSource
[Documentation] Delete OperatorHub's CatalogSource.
Delete CatalogSource
[Documentation] Delete CatalogSource.
Oc Delete -f ${CATALOG_SOURCE}

Delete CertManager Subscription
Expand Down