diff --git a/deploy/chart/catalog_resources/rh-operators/marketplace-catalogsourceconfig.crd.yaml b/deploy/chart/catalog_resources/rh-operators/marketplace-catalogsourceconfig.crd.yaml deleted file mode 100644 index c73ff97c1f..0000000000 --- a/deploy/chart/catalog_resources/rh-operators/marketplace-catalogsourceconfig.crd.yaml +++ /dev/null @@ -1,54 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: catalogsourceconfigs.marketplace.redhat.com - annotations: - displayName: Catalog Source Config - description: Represents a CatalogSourceConfig. -spec: - group: marketplace.redhat.com - names: - kind: CatalogSourceConfig - listKind: CatalogSourceConfigList - plural: catalogsourceconfigs - singular: catalogsourceconfig - shortNames: - - csc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: TargetNamespace - type: string - description: The namespace where the operators will be enabled - JSONPath: .spec.targetNamespace - - name: Packages - type: string - description: List of operator(s) which will be enabled in the target namespace - JSONPath: .spec.packages - - name: Status - type: string - description: Current status of the CatalogSourceConfig - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for a CatalogSourceConfig - required: - - targetNamespace - - packages - properties: - targetNamespace: - type: string - description: The namespace where the operators will be enabled - packages: - type: string - description: Comma separated list of operator(s) without spaces which will be enabled in the target namespace diff --git a/deploy/chart/catalog_resources/rh-operators/marketplace-operatorsource.crd.yaml b/deploy/chart/catalog_resources/rh-operators/marketplace-operatorsource.crd.yaml deleted file mode 100644 index 1548974876..0000000000 --- a/deploy/chart/catalog_resources/rh-operators/marketplace-operatorsource.crd.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: operatorsources.marketplace.redhat.com - annotations: - displayName: Operator Source - description: Represents an OperatorSource. -spec: - group: marketplace.redhat.com - names: - kind: OperatorSource - listKind: OperatorSourceList - plural: operatorsources - singular: operatorsource - shortNames: - - opsrc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: Type - type: string - description: The type of the OperatorSource - JSONPath: .spec.type - - name: Endpoint - type: string - description: The endpoint of the OperatorSource - JSONPath: .spec.endpoint - - name: Registry - type: string - description: App registry namespace - JSONPath: .spec.registryNamespace - - name: Status - type: string - description: Current status of the OperatorSource - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for an OperatorSource. - required: - - type - - endpoint - - registryNamespace - properties: - type: - type: string - description: The type of the OperatorSource - pattern: 'appregistry' - endpoint: - type: string - description: Points to the remote app registry server from where operator manifests can be fetched. - registryNamespace: - type: string - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. diff --git a/deploy/chart/catalog_resources/rh-operators/marketplace.package.yaml b/deploy/chart/catalog_resources/rh-operators/marketplace.package.yaml deleted file mode 100644 index f4c0717015..0000000000 --- a/deploy/chart/catalog_resources/rh-operators/marketplace.package.yaml +++ /dev/null @@ -1,5 +0,0 @@ -#! package-manifest: deploy/chart/catalog_resources/rh-operators/marketplace.v0.0.1.clusterserviceversion.yaml -packageName: marketplace -channels: -- name: alpha - currentCSV: marketplace-operator.v0.0.1 diff --git a/deploy/chart/catalog_resources/rh-operators/marketplace.v0.0.1.clusterserviceversion.yaml b/deploy/chart/catalog_resources/rh-operators/marketplace.v0.0.1.clusterserviceversion.yaml deleted file mode 100644 index 77a345c3cc..0000000000 --- a/deploy/chart/catalog_resources/rh-operators/marketplace.v0.0.1.clusterserviceversion.yaml +++ /dev/null @@ -1,147 +0,0 @@ -#! validate-crd: deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml -#! parse-kind: ClusterServiceVersion -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - name: marketplace-operator.v0.0.1 - namespace: placeholder -spec: - displayName: marketplace-operator - description: |- - Marketplace is a gateway for users to consume off-cluster Operators which will include Red Hat, ISV, optional OpenShift and community content. - keywords: ['marketplace', 'catalog', 'olm', 'admin'] - version: 0.0.1 - maturity: alpha - maintainers: - - name: AOS Marketplace Team - email: aos-marketplace@redhat.com - provider: - name: Red Hat - labels: - name: marketplace-operator - selector: - matchLabels: - name: marketplace-operator - links: - - name: Markplace Operator Source Code - url: https://github.com/operator-framework/operator-marketplace - installModes: - - type: OwnNamespace - supported: true - - type: SingleNamespace - supported: true - - type: MultiNamespace - supported: false - - type: AllNamespaces - supported: true - install: - strategy: deployment - spec: - clusterPermissions: - - serviceAccountName: marketplace-operator - rules: - - apiGroups: - - marketplace.redhat.com - resources: - - "*" - verbs: - - "*" - - apiGroups: - - "" - resources: - - services - - configmaps - verbs: - - "*" - - apiGroups: - - operators.coreos.com - resources: - - catalogsources - verbs: - - "*" - deployments: - - name: marketplace-operator - spec: - replicas: 1 - selector: - matchLabels: - name: marketplace-operator - template: - metadata: - name: marketplace-operator - labels: - name: marketplace-operator - spec: - serviceAccountName: marketplace-operator - containers: - - name: marketplace-operator - image: quay.io/openshift/origin-operator-marketplace:latest - ports: - - containerPort: 60000 - name: metrics - - containerPort: 8080 - name: healthz - command: - - marketplace-operator - imagePullPolicy: Always - livenessProbe: - httpGet: - path: /healthz - port: 8080 - readinessProbe: - httpGet: - path: /healthz - port: 8080 - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OPERATOR_NAME - value: "marketplace-operator" - customresourcedefinitions: - owned: - - name: operatorsources.marketplace.redhat.com - version: v1alpha1 - kind: OperatorSource - displayName: Operator Source - description: Represents an OperatorSource. - specDescriptors: - - description: The type of the operator source. - displayName: Type - path: type - - description: Points to the remote app registry server from where operator manifests can be fetched. - displayName: Endpoint - path: endpoint - - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. - displayName: Registry Namespace - path: registryNamespace - statusDescriptors: - - description: Current status of the CatalogSourceConfig - displayName: Current Phase Name - path: currentPhase.phase.name - - description: Message associated with the current status - displayName: Current Phase Message - path: currentPhase.phase.message - - name: catalogsourceconfigs.marketplace.redhat.com - version: v1alpha1 - kind: CatalogSourceConfig - displayName: Catalog Source Config - description: Represents a CatalogSourceConfig object which is used to configure a CatalogSource. - specDescriptors: - - description: The namespace where the operators will be enabled. - displayName: Target Namespace - path: targetNamespace - - description: List of operator(s) which will be enabled in the target namespace - displayName: Packages - path: packages - statusDescriptors: - - description: Current status of the CatalogSourceConfig - displayName: Current Phase Name - path: currentPhase.phase.name - - description: Message associated with the current status - displayName: Current Phase Message - path: currentPhase.phase.message diff --git a/deploy/chart/templates/0000_30_18-operatorsource.crd.yaml b/deploy/chart/templates/0000_30_18-operatorsource.crd.yaml deleted file mode 100644 index 1548974876..0000000000 --- a/deploy/chart/templates/0000_30_18-operatorsource.crd.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: operatorsources.marketplace.redhat.com - annotations: - displayName: Operator Source - description: Represents an OperatorSource. -spec: - group: marketplace.redhat.com - names: - kind: OperatorSource - listKind: OperatorSourceList - plural: operatorsources - singular: operatorsource - shortNames: - - opsrc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: Type - type: string - description: The type of the OperatorSource - JSONPath: .spec.type - - name: Endpoint - type: string - description: The endpoint of the OperatorSource - JSONPath: .spec.endpoint - - name: Registry - type: string - description: App registry namespace - JSONPath: .spec.registryNamespace - - name: Status - type: string - description: Current status of the OperatorSource - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for an OperatorSource. - required: - - type - - endpoint - - registryNamespace - properties: - type: - type: string - description: The type of the OperatorSource - pattern: 'appregistry' - endpoint: - type: string - description: Points to the remote app registry server from where operator manifests can be fetched. - registryNamespace: - type: string - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. diff --git a/deploy/chart/templates/0000_30_19-operatorsource-default.yaml b/deploy/chart/templates/0000_30_19-operatorsource-default.yaml deleted file mode 100644 index cbd2dc46d6..0000000000 --- a/deploy/chart/templates/0000_30_19-operatorsource-default.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: "marketplace.redhat.com/v1alpha1" -kind: "OperatorSource" -metadata: - name: "marketplace-operators" - namespace: "{{ .Values.operator_namespace }}" -spec: - type: appregistry - endpoint: "https://quay.io/cnr" - registryNamespace: "operators" diff --git a/deploy/ocp/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml b/deploy/ocp/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml deleted file mode 100644 index c7693ec34b..0000000000 --- a/deploy/ocp/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml +++ /dev/null @@ -1,68 +0,0 @@ -##--- -# Source: olm/templates/0000_30_18-operatorsource.crd.yaml -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: operatorsources.marketplace.redhat.com - annotations: - displayName: Operator Source - description: Represents an OperatorSource. -spec: - group: marketplace.redhat.com - names: - kind: OperatorSource - listKind: OperatorSourceList - plural: operatorsources - singular: operatorsource - shortNames: - - opsrc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: Type - type: string - description: The type of the OperatorSource - JSONPath: .spec.type - - name: Endpoint - type: string - description: The endpoint of the OperatorSource - JSONPath: .spec.endpoint - - name: Registry - type: string - description: App registry namespace - JSONPath: .spec.registryNamespace - - name: Status - type: string - description: Current status of the OperatorSource - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for an OperatorSource. - required: - - type - - endpoint - - registryNamespace - properties: - type: - type: string - description: The type of the OperatorSource - pattern: 'appregistry' - endpoint: - type: string - description: Points to the remote app registry server from where operator manifests can be fetched. - registryNamespace: - type: string - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. diff --git a/deploy/ocp/manifests/0.8.0/0000_30_19-operatorsource-default.yaml b/deploy/ocp/manifests/0.8.0/0000_30_19-operatorsource-default.yaml deleted file mode 100644 index 657b6a07c4..0000000000 --- a/deploy/ocp/manifests/0.8.0/0000_30_19-operatorsource-default.yaml +++ /dev/null @@ -1,11 +0,0 @@ -##--- -# Source: olm/templates/0000_30_19-operatorsource-default.yaml -apiVersion: "marketplace.redhat.com/v1alpha1" -kind: "OperatorSource" -metadata: - name: "marketplace-operators" - namespace: "openshift-operators" -spec: - type: appregistry - endpoint: "https://quay.io/cnr" - registryNamespace: "operators" diff --git a/deploy/okd/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml b/deploy/okd/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml deleted file mode 100644 index c7693ec34b..0000000000 --- a/deploy/okd/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml +++ /dev/null @@ -1,68 +0,0 @@ -##--- -# Source: olm/templates/0000_30_18-operatorsource.crd.yaml -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: operatorsources.marketplace.redhat.com - annotations: - displayName: Operator Source - description: Represents an OperatorSource. -spec: - group: marketplace.redhat.com - names: - kind: OperatorSource - listKind: OperatorSourceList - plural: operatorsources - singular: operatorsource - shortNames: - - opsrc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: Type - type: string - description: The type of the OperatorSource - JSONPath: .spec.type - - name: Endpoint - type: string - description: The endpoint of the OperatorSource - JSONPath: .spec.endpoint - - name: Registry - type: string - description: App registry namespace - JSONPath: .spec.registryNamespace - - name: Status - type: string - description: Current status of the OperatorSource - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for an OperatorSource. - required: - - type - - endpoint - - registryNamespace - properties: - type: - type: string - description: The type of the OperatorSource - pattern: 'appregistry' - endpoint: - type: string - description: Points to the remote app registry server from where operator manifests can be fetched. - registryNamespace: - type: string - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. diff --git a/deploy/okd/manifests/0.8.0/0000_30_19-operatorsource-default.yaml b/deploy/okd/manifests/0.8.0/0000_30_19-operatorsource-default.yaml deleted file mode 100644 index 657b6a07c4..0000000000 --- a/deploy/okd/manifests/0.8.0/0000_30_19-operatorsource-default.yaml +++ /dev/null @@ -1,11 +0,0 @@ -##--- -# Source: olm/templates/0000_30_19-operatorsource-default.yaml -apiVersion: "marketplace.redhat.com/v1alpha1" -kind: "OperatorSource" -metadata: - name: "marketplace-operators" - namespace: "openshift-operators" -spec: - type: appregistry - endpoint: "https://quay.io/cnr" - registryNamespace: "operators" diff --git a/deploy/upstream/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml b/deploy/upstream/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml deleted file mode 100644 index c7693ec34b..0000000000 --- a/deploy/upstream/manifests/0.8.0/0000_30_18-operatorsource.crd.yaml +++ /dev/null @@ -1,68 +0,0 @@ -##--- -# Source: olm/templates/0000_30_18-operatorsource.crd.yaml -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: operatorsources.marketplace.redhat.com - annotations: - displayName: Operator Source - description: Represents an OperatorSource. -spec: - group: marketplace.redhat.com - names: - kind: OperatorSource - listKind: OperatorSourceList - plural: operatorsources - singular: operatorsource - shortNames: - - opsrc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: Type - type: string - description: The type of the OperatorSource - JSONPath: .spec.type - - name: Endpoint - type: string - description: The endpoint of the OperatorSource - JSONPath: .spec.endpoint - - name: Registry - type: string - description: App registry namespace - JSONPath: .spec.registryNamespace - - name: Status - type: string - description: Current status of the OperatorSource - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for an OperatorSource. - required: - - type - - endpoint - - registryNamespace - properties: - type: - type: string - description: The type of the OperatorSource - pattern: 'appregistry' - endpoint: - type: string - description: Points to the remote app registry server from where operator manifests can be fetched. - registryNamespace: - type: string - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. diff --git a/deploy/upstream/manifests/0.8.0/0000_30_19-operatorsource-default.yaml b/deploy/upstream/manifests/0.8.0/0000_30_19-operatorsource-default.yaml deleted file mode 100644 index a9dae7755b..0000000000 --- a/deploy/upstream/manifests/0.8.0/0000_30_19-operatorsource-default.yaml +++ /dev/null @@ -1,11 +0,0 @@ -##--- -# Source: olm/templates/0000_30_19-operatorsource-default.yaml -apiVersion: "marketplace.redhat.com/v1alpha1" -kind: "OperatorSource" -metadata: - name: "marketplace-operators" - namespace: "operators" -spec: - type: appregistry - endpoint: "https://quay.io/cnr" - registryNamespace: "operators" diff --git a/manifests/0000_30_18-operatorsource.crd.yaml b/manifests/0000_30_18-operatorsource.crd.yaml deleted file mode 100644 index b80757a529..0000000000 --- a/manifests/0000_30_18-operatorsource.crd.yaml +++ /dev/null @@ -1,68 +0,0 @@ ---- -# Source: olm/templates/0000_30_18-operatorsource.crd.yaml -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: operatorsources.marketplace.redhat.com - annotations: - displayName: Operator Source - description: Represents an OperatorSource. -spec: - group: marketplace.redhat.com - names: - kind: OperatorSource - listKind: OperatorSourceList - plural: operatorsources - singular: operatorsource - shortNames: - - opsrc - scope: Namespaced - version: v1alpha1 - additionalPrinterColumns: - - name: Type - type: string - description: The type of the OperatorSource - JSONPath: .spec.type - - name: Endpoint - type: string - description: The endpoint of the OperatorSource - JSONPath: .spec.endpoint - - name: Registry - type: string - description: App registry namespace - JSONPath: .spec.registryNamespace - - name: Status - type: string - description: Current status of the OperatorSource - JSONPath: .status.currentPhase.phase.name - - name: Message - type: string - description: Message associated with the current status - JSONPath: .status.currentPhase.phase.message - - name: Age - type: date - JSONPath: .metadata.creationTimestamp - validation: - openAPIV3Schema: - properties: - spec: - type: object - description: Spec for an OperatorSource. - required: - - type - - endpoint - - registryNamespace - properties: - type: - type: string - description: The type of the OperatorSource - pattern: 'appregistry' - endpoint: - type: string - description: Points to the remote app registry server from where operator manifests can be fetched. - registryNamespace: - type: string - description: |- - The namespace in app registry. - Only operator manifests under this namespace will be visible. - Please note that this is not a k8s namespace. diff --git a/manifests/0000_30_19-operatorsource-default.yaml b/manifests/0000_30_19-operatorsource-default.yaml deleted file mode 100644 index 131b4ea6fc..0000000000 --- a/manifests/0000_30_19-operatorsource-default.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Source: olm/templates/0000_30_19-operatorsource-default.yaml -apiVersion: "marketplace.redhat.com/v1alpha1" -kind: "OperatorSource" -metadata: - name: "marketplace-operators" - namespace: "openshift-operators" -spec: - type: appregistry - endpoint: "https://quay.io/cnr" - registryNamespace: "operators" diff --git a/pkg/controller/registry/directory_loader_test.go b/pkg/controller/registry/directory_loader_test.go index 4aff518e73..d181632902 100644 --- a/pkg/controller/registry/directory_loader_test.go +++ b/pkg/controller/registry/directory_loader_test.go @@ -22,7 +22,6 @@ func TestDirectoryLoader(t *testing.T) { require.Contains(t, catalog.packages, "federationv2") require.Contains(t, catalog.packages, "prometheus") require.Contains(t, catalog.packages, "svcat") - require.Contains(t, catalog.packages, "marketplace") } func TestDirectoryLoaderHiddenDirs(t *testing.T) {