diff --git a/deploy/chart/templates/_packageserver.clusterserviceversion.yaml b/deploy/chart/templates/_packageserver.clusterserviceversion.yaml index cf424aa4620..ecff591d5ea 100644 --- a/deploy/chart/templates/_packageserver.clusterserviceversion.yaml +++ b/deploy/chart/templates/_packageserver.clusterserviceversion.yaml @@ -74,6 +74,9 @@ app: packageserver spec: serviceAccountName: packageserver + {{- if .Values.olm.nodeSelector }} + nodeSelector: {{ toYaml .Values.package.nodeSelector }} + {{- end }} containers: - name: packageserver command: @@ -118,4 +121,4 @@ description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps deploymentName: packageserver containerPort: {{ .Values.package.service.internalPort }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml index 3f34a55f8ca..587e512fa20 100644 --- a/deploy/chart/values.yaml +++ b/deploy/chart/values.yaml @@ -11,6 +11,7 @@ olm: pullPolicy: Always service: internalPort: 8080 + nodeSelector: beta.kubernetes.io/os:linux catalog: replicaCount: 1 @@ -19,6 +20,7 @@ catalog: pullPolicy: Always service: internalPort: 8080 + nodeSelector: beta.kubernetes.io/os:linux package: replicaCount: 1 @@ -27,6 +29,7 @@ package: pullPolicy: Always service: internalPort: 5443 + nodeSelector: beta.kubernetes.io/os:linux catalog_sources: - rh-operators diff --git a/manifests/0000_30_00-namespace.yaml b/manifests/0000_30_00-namespace.yaml index 78e1ad2bf11..1e086b3e905 100644 --- a/manifests/0000_30_00-namespace.yaml +++ b/manifests/0000_30_00-namespace.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_00-namespace.yaml apiVersion: v1 kind: Namespace diff --git a/manifests/0000_30_01-olm-operator.serviceaccount.yaml b/manifests/0000_30_01-olm-operator.serviceaccount.yaml index ef2cc7dd1bf..8ab035f6300 100644 --- a/manifests/0000_30_01-olm-operator.serviceaccount.yaml +++ b/manifests/0000_30_01-olm-operator.serviceaccount.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_01-olm-operator.serviceaccount.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/manifests/0000_30_02-clusterserviceversion.crd.yaml b/manifests/0000_30_02-clusterserviceversion.crd.yaml index 147523dd900..55ec9629967 100644 --- a/manifests/0000_30_02-clusterserviceversion.crd.yaml +++ b/manifests/0000_30_02-clusterserviceversion.crd.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_02-clusterserviceversion.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/manifests/0000_30_03-installplan.crd.yaml b/manifests/0000_30_03-installplan.crd.yaml index 3b3ec97e6e1..1cdf63651ae 100644 --- a/manifests/0000_30_03-installplan.crd.yaml +++ b/manifests/0000_30_03-installplan.crd.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_03-installplan.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/manifests/0000_30_04-subscription.crd.yaml b/manifests/0000_30_04-subscription.crd.yaml index 4a62c6ce8ed..9894ebd30cc 100644 --- a/manifests/0000_30_04-subscription.crd.yaml +++ b/manifests/0000_30_04-subscription.crd.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_04-subscription.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/manifests/0000_30_05-catalogsource.crd.yaml b/manifests/0000_30_05-catalogsource.crd.yaml index f075d1d62c2..0b17256bd2c 100644 --- a/manifests/0000_30_05-catalogsource.crd.yaml +++ b/manifests/0000_30_05-catalogsource.crd.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_05-catalogsource.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/manifests/0000_30_06-rh-operators.configmap.yaml b/manifests/0000_30_06-rh-operators.configmap.yaml index 6058b134066..c35648f5330 100644 --- a/manifests/0000_30_06-rh-operators.configmap.yaml +++ b/manifests/0000_30_06-rh-operators.configmap.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_06-rh-operators.configmap.yaml kind: ConfigMap @@ -6161,128 +6161,6 @@ data: plural: "" conditions: null - - 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 - - - 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. - - apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -11750,154 +11628,6 @@ data: name: replicaschedulingpreferences.scheduling.federation.k8s.io version: v1alpha1 - - #! 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 - - #! validate-crd: deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml #! parse-kind: ClusterServiceVersion apiVersion: operators.coreos.com/v1alpha1 @@ -13449,12 +13179,6 @@ data: - name: alpha currentCSV: federationv2.v0.0.2 - - #! 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 - - #! package-manifest: deploy/chart/catalog_resources/rh-operators/metering-operator.v0.12.0.clusterserviceversion.yaml packageName: metering channels: diff --git a/manifests/0000_30_07-certified-operators.configmap.yaml b/manifests/0000_30_07-certified-operators.configmap.yaml index 9cf94f2f6c6..69352ace970 100644 --- a/manifests/0000_30_07-certified-operators.configmap.yaml +++ b/manifests/0000_30_07-certified-operators.configmap.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_07-certified-operators.configmap.yaml kind: ConfigMap diff --git a/manifests/0000_30_08-certified-operators.catalogsource.yaml b/manifests/0000_30_08-certified-operators.catalogsource.yaml index 2bbb7e0d196..77cdb1ff692 100644 --- a/manifests/0000_30_08-certified-operators.catalogsource.yaml +++ b/manifests/0000_30_08-certified-operators.catalogsource.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_08-certified-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml diff --git a/manifests/0000_30_09-rh-operators.catalogsource.yaml b/manifests/0000_30_09-rh-operators.catalogsource.yaml index 377ff5ed3c7..035e4e8f426 100644 --- a/manifests/0000_30_09-rh-operators.catalogsource.yaml +++ b/manifests/0000_30_09-rh-operators.catalogsource.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_09-rh-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml diff --git a/manifests/0000_30_10-olm-operator.deployment.yaml b/manifests/0000_30_10-olm-operator.deployment.yaml index 4b048c29537..364021d5210 100644 --- a/manifests/0000_30_10-olm-operator.deployment.yaml +++ b/manifests/0000_30_10-olm-operator.deployment.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_10-olm-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment @@ -44,3 +44,6 @@ spec: fieldPath: metadata.namespace - name: OPERATOR_NAME value: olm-operator + nodeSelector: + beta.kubernetes.io/os:linux + diff --git a/manifests/0000_30_11-catalog-operator.deployment.yaml b/manifests/0000_30_11-catalog-operator.deployment.yaml index df4a0b48b09..4d974d4131a 100644 --- a/manifests/0000_30_11-catalog-operator.deployment.yaml +++ b/manifests/0000_30_11-catalog-operator.deployment.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_11-catalog-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment @@ -39,3 +39,6 @@ spec: httpGet: path: /healthz port: 8080 + nodeSelector: + beta.kubernetes.io/os:linux + diff --git a/manifests/0000_30_12-aggregated.clusterrole.yaml b/manifests/0000_30_12-aggregated.clusterrole.yaml index b90b82deee0..e91d70cb0a9 100644 --- a/manifests/0000_30_12-aggregated.clusterrole.yaml +++ b/manifests/0000_30_12-aggregated.clusterrole.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_12-aggregated.clusterrole.yaml kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 diff --git a/manifests/0000_30_13-operatorgroup.crd.yaml b/manifests/0000_30_13-operatorgroup.crd.yaml index 2b000b6d686..43678bdb98f 100644 --- a/manifests/0000_30_13-operatorgroup.crd.yaml +++ b/manifests/0000_30_13-operatorgroup.crd.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_13-operatorgroup.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition diff --git a/manifests/0000_30_14-olm-operators.configmap.yaml b/manifests/0000_30_14-olm-operators.configmap.yaml index dc2eb54fb48..9d0077c9b48 100644 --- a/manifests/0000_30_14-olm-operators.configmap.yaml +++ b/manifests/0000_30_14-olm-operators.configmap.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_14-olm-operators.configmap.yaml kind: ConfigMap apiVersion: v1 @@ -85,6 +85,8 @@ data: app: packageserver spec: serviceAccountName: packageserver + nodeSelector: beta.kubernetes.io/os:linux + containers: - name: packageserver command: diff --git a/manifests/0000_30_15-olm-operators.catalogsource.yaml b/manifests/0000_30_15-olm-operators.catalogsource.yaml index a46ba7b950d..36190a949ae 100644 --- a/manifests/0000_30_15-olm-operators.catalogsource.yaml +++ b/manifests/0000_30_15-olm-operators.catalogsource.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_15-olm-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml #! parse-kind: CatalogSource diff --git a/manifests/0000_30_16-operatorgroup-default.yaml b/manifests/0000_30_16-operatorgroup-default.yaml index c9b313a1484..2c3ced93da1 100644 --- a/manifests/0000_30_16-operatorgroup-default.yaml +++ b/manifests/0000_30_16-operatorgroup-default.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_16-operatorgroup-default.yaml apiVersion: operators.coreos.com/v1alpha2 kind: OperatorGroup diff --git a/manifests/0000_30_17-packageserver.subscription.yaml b/manifests/0000_30_17-packageserver.subscription.yaml index bde77c578e7..706c438f142 100644 --- a/manifests/0000_30_17-packageserver.subscription.yaml +++ b/manifests/0000_30_17-packageserver.subscription.yaml @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/0000_30_17-packageserver.subscription.yaml #! validate-crd: ./deploy/chart/templates/04-subscription.crd.yaml #! parse-kind: Subscription diff --git a/manifests/image-references b/manifests/image-references index 6adbb33b381..232e3be227c 100644 --- a/manifests/image-references +++ b/manifests/image-references @@ -1,4 +1,4 @@ ---- +##--- # Source: olm/templates/image-references kind: ImageStream