diff --git a/deploy/chart/templates/0000_30_00-namespace.yaml b/deploy/chart/templates/0000_50_00-namespace.yaml similarity index 100% rename from deploy/chart/templates/0000_30_00-namespace.yaml rename to deploy/chart/templates/0000_50_00-namespace.yaml diff --git a/deploy/chart/templates/0000_30_01-olm-operator.serviceaccount.yaml b/deploy/chart/templates/0000_50_01-olm-operator.serviceaccount.yaml similarity index 100% rename from deploy/chart/templates/0000_30_01-olm-operator.serviceaccount.yaml rename to deploy/chart/templates/0000_50_01-olm-operator.serviceaccount.yaml diff --git a/deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml b/deploy/chart/templates/0000_50_02-clusterserviceversion.crd.yaml similarity index 100% rename from deploy/chart/templates/0000_30_02-clusterserviceversion.crd.yaml rename to deploy/chart/templates/0000_50_02-clusterserviceversion.crd.yaml diff --git a/deploy/chart/templates/0000_30_03-installplan.crd.yaml b/deploy/chart/templates/0000_50_03-installplan.crd.yaml similarity index 100% rename from deploy/chart/templates/0000_30_03-installplan.crd.yaml rename to deploy/chart/templates/0000_50_03-installplan.crd.yaml diff --git a/deploy/chart/templates/0000_30_04-subscription.crd.yaml b/deploy/chart/templates/0000_50_04-subscription.crd.yaml similarity index 100% rename from deploy/chart/templates/0000_30_04-subscription.crd.yaml rename to deploy/chart/templates/0000_50_04-subscription.crd.yaml diff --git a/deploy/chart/templates/0000_30_05-catalogsource.crd.yaml b/deploy/chart/templates/0000_50_05-catalogsource.crd.yaml similarity index 100% rename from deploy/chart/templates/0000_30_05-catalogsource.crd.yaml rename to deploy/chart/templates/0000_50_05-catalogsource.crd.yaml diff --git a/deploy/chart/templates/0000_30_10-olm-operator.deployment.yaml b/deploy/chart/templates/0000_50_10-olm-operator.deployment.yaml similarity index 100% rename from deploy/chart/templates/0000_30_10-olm-operator.deployment.yaml rename to deploy/chart/templates/0000_50_10-olm-operator.deployment.yaml diff --git a/deploy/chart/templates/0000_30_11-catalog-operator.deployment.yaml b/deploy/chart/templates/0000_50_11-catalog-operator.deployment.yaml similarity index 100% rename from deploy/chart/templates/0000_30_11-catalog-operator.deployment.yaml rename to deploy/chart/templates/0000_50_11-catalog-operator.deployment.yaml diff --git a/deploy/chart/templates/0000_30_12-aggregated.clusterrole.yaml b/deploy/chart/templates/0000_50_12-aggregated.clusterrole.yaml similarity index 100% rename from deploy/chart/templates/0000_30_12-aggregated.clusterrole.yaml rename to deploy/chart/templates/0000_50_12-aggregated.clusterrole.yaml diff --git a/deploy/chart/templates/0000_30_13-operatorgroup.crd.yaml b/deploy/chart/templates/0000_50_13-operatorgroup.crd.yaml similarity index 100% rename from deploy/chart/templates/0000_30_13-operatorgroup.crd.yaml rename to deploy/chart/templates/0000_50_13-operatorgroup.crd.yaml diff --git a/deploy/chart/templates/0000_30_14-olm-operators.configmap.yaml b/deploy/chart/templates/0000_50_14-olm-operators.configmap.yaml similarity index 100% rename from deploy/chart/templates/0000_30_14-olm-operators.configmap.yaml rename to deploy/chart/templates/0000_50_14-olm-operators.configmap.yaml diff --git a/deploy/chart/templates/0000_30_15-olm-operators.catalogsource.yaml b/deploy/chart/templates/0000_50_15-olm-operators.catalogsource.yaml similarity index 100% rename from deploy/chart/templates/0000_30_15-olm-operators.catalogsource.yaml rename to deploy/chart/templates/0000_50_15-olm-operators.catalogsource.yaml diff --git a/deploy/chart/templates/0000_30_16-operatorgroup-default.yaml b/deploy/chart/templates/0000_50_16-operatorgroup-default.yaml similarity index 100% rename from deploy/chart/templates/0000_30_16-operatorgroup-default.yaml rename to deploy/chart/templates/0000_50_16-operatorgroup-default.yaml diff --git a/deploy/chart/templates/0000_30_17-packageserver.subscription.yaml b/deploy/chart/templates/0000_50_17-packageserver.subscription.yaml similarity index 100% rename from deploy/chart/templates/0000_30_17-packageserver.subscription.yaml rename to deploy/chart/templates/0000_50_17-packageserver.subscription.yaml diff --git a/deploy/ocp/manifests/0.8.1/0000_30_00-namespace.yaml b/deploy/ocp/manifests/0.8.1/0000_50_00-namespace.yaml similarity index 83% rename from deploy/ocp/manifests/0.8.1/0000_30_00-namespace.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_00-namespace.yaml index e09ac2c0a3..3826583ee0 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_00-namespace.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_00-namespace.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_00-namespace.yaml +# Source: olm/templates/0000_50_00-namespace.yaml apiVersion: v1 kind: Namespace metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml b/deploy/ocp/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml similarity index 92% rename from deploy/okd/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml index 8ab035f630..0aeece80a7 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_01-olm-operator.serviceaccount.yaml +# Source: olm/templates/0000_50_01-olm-operator.serviceaccount.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/manifests/0000_30_02-clusterserviceversion.crd.yaml b/deploy/ocp/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml similarity index 99% rename from manifests/0000_30_02-clusterserviceversion.crd.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml index ff3e6dac0d..f7d8e6bf54 100644 --- a/manifests/0000_30_02-clusterserviceversion.crd.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_02-clusterserviceversion.crd.yaml +# Source: olm/templates/0000_50_02-clusterserviceversion.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_03-installplan.crd.yaml b/deploy/ocp/manifests/0.8.1/0000_50_03-installplan.crd.yaml similarity index 97% rename from deploy/upstream/manifests/0.8.1/0000_30_03-installplan.crd.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_03-installplan.crd.yaml index 1cdf63651a..9c48076164 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_03-installplan.crd.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_03-installplan.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_03-installplan.crd.yaml +# Source: olm/templates/0000_50_03-installplan.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_04-subscription.crd.yaml b/deploy/ocp/manifests/0.8.1/0000_50_04-subscription.crd.yaml similarity index 97% rename from deploy/ocp/manifests/0.8.1/0000_30_04-subscription.crd.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_04-subscription.crd.yaml index 9894ebd30c..5f93f34ace 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_04-subscription.crd.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_04-subscription.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_04-subscription.crd.yaml +# Source: olm/templates/0000_50_04-subscription.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml b/deploy/ocp/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml similarity index 94% rename from deploy/upstream/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml index 0b17256bd2..ddb2354515 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_05-catalogsource.crd.yaml +# Source: olm/templates/0000_50_05-catalogsource.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -58,11 +58,16 @@ spec: enum: - internal # deprecated - configmap + - grpc configMap: type: string description: The name of a ConfigMap that holds the entries for an in-memory catalog. + image: + type: string + description: An image that serves a grpc registry. Only valid for `grpc` sourceType. + displayName: type: string description: Pretty name for display diff --git a/deploy/ocp/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml b/deploy/ocp/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml similarity index 95% rename from deploy/ocp/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml index 25ff5098a7..9f176dce4b 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_10-olm-operator.deployment.yaml +# Source: olm/templates/0000_50_10-olm-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/manifests/0000_30_11-catalog-operator.deployment.yaml b/deploy/ocp/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml similarity index 94% rename from manifests/0000_30_11-catalog-operator.deployment.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml index 7a114a4015..5662195926 100644 --- a/manifests/0000_30_11-catalog-operator.deployment.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_11-catalog-operator.deployment.yaml +# Source: olm/templates/0000_50_11-catalog-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml b/deploy/ocp/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml similarity index 93% rename from deploy/upstream/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml index e91d70cb0a..adfebe48e6 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_12-aggregated.clusterrole.yaml +# Source: olm/templates/0000_50_12-aggregated.clusterrole.yaml kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml b/deploy/ocp/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml similarity index 97% rename from deploy/okd/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml index 995ab2e07e..8faa1bb107 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_13-operatorgroup.crd.yaml +# Source: olm/templates/0000_50_13-operatorgroup.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml b/deploy/ocp/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml similarity index 97% rename from deploy/ocp/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml index b944670740..09857a6ab7 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_14-olm-operators.configmap.yaml +# Source: olm/templates/0000_50_14-olm-operators.configmap.yaml kind: ConfigMap apiVersion: v1 metadata: @@ -18,6 +18,7 @@ data: spec: displayName: Package Server description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion. + minKubeVersion: 1.11.0 keywords: ['packagemanifests', 'olm', 'packages'] maintainers: - name: Red Hat diff --git a/deploy/okd/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml b/deploy/ocp/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml similarity index 84% rename from deploy/okd/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml index 36190a949a..7e58c26b13 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_15-olm-operators.catalogsource.yaml +# Source: olm/templates/0000_50_15-olm-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml #! parse-kind: CatalogSource apiVersion: operators.coreos.com/v1alpha1 diff --git a/deploy/okd/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml b/deploy/ocp/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml similarity index 85% rename from deploy/okd/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml index 808fa53a60..6a03f0832e 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_16-operatorgroup-default.yaml +# Source: olm/templates/0000_50_16-operatorgroup-default.yaml apiVersion: operators.coreos.com/v1alpha2 kind: OperatorGroup metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml b/deploy/ocp/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml similarity index 85% rename from deploy/ocp/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml rename to deploy/ocp/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml index 706c438f14..56ec0dee17 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml +++ b/deploy/ocp/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_17-packageserver.subscription.yaml +# Source: olm/templates/0000_50_17-packageserver.subscription.yaml #! validate-crd: ./deploy/chart/templates/04-subscription.crd.yaml #! parse-kind: Subscription apiVersion: operators.coreos.com/v1alpha1 diff --git a/manifests/0000_30_00-namespace.yaml b/deploy/okd/manifests/0.8.1/0000_50_00-namespace.yaml similarity index 83% rename from manifests/0000_30_00-namespace.yaml rename to deploy/okd/manifests/0.8.1/0000_50_00-namespace.yaml index e09ac2c0a3..3826583ee0 100644 --- a/manifests/0000_30_00-namespace.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_00-namespace.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_00-namespace.yaml +# Source: olm/templates/0000_50_00-namespace.yaml apiVersion: v1 kind: Namespace metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml b/deploy/okd/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml similarity index 92% rename from deploy/ocp/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml rename to deploy/okd/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml index 8ab035f630..0aeece80a7 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_01-olm-operator.serviceaccount.yaml +# Source: olm/templates/0000_50_01-olm-operator.serviceaccount.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml b/deploy/okd/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml similarity index 99% rename from deploy/okd/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml rename to deploy/okd/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml index 55ec962996..f7d8e6bf54 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_02-clusterserviceversion.crd.yaml +# Source: olm/templates/0000_50_02-clusterserviceversion.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -62,6 +62,10 @@ spec: type: string description: Human readable description of what the application does + minKubeVersion: + type: string + description: Minimum kubernetes version requirement on the server to deploy operator + keywords: type: array description: List of keywords which will be used to discover and categorize app types @@ -200,7 +204,7 @@ spec: description: Version of the API resource kind: type: string - description: Kind of the API resource + description: Kind of the API resource apiservicedefinitions: type: object properties: diff --git a/deploy/okd/manifests/0.8.1/0000_30_03-installplan.crd.yaml b/deploy/okd/manifests/0.8.1/0000_50_03-installplan.crd.yaml similarity index 97% rename from deploy/okd/manifests/0.8.1/0000_30_03-installplan.crd.yaml rename to deploy/okd/manifests/0.8.1/0000_50_03-installplan.crd.yaml index 1cdf63651a..9c48076164 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_03-installplan.crd.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_03-installplan.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_03-installplan.crd.yaml +# Source: olm/templates/0000_50_03-installplan.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_04-subscription.crd.yaml b/deploy/okd/manifests/0.8.1/0000_50_04-subscription.crd.yaml similarity index 97% rename from deploy/upstream/manifests/0.8.1/0000_30_04-subscription.crd.yaml rename to deploy/okd/manifests/0.8.1/0000_50_04-subscription.crd.yaml index 9894ebd30c..5f93f34ace 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_04-subscription.crd.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_04-subscription.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_04-subscription.crd.yaml +# Source: olm/templates/0000_50_04-subscription.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml b/deploy/okd/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml similarity index 94% rename from deploy/ocp/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml rename to deploy/okd/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml index 0b17256bd2..ddb2354515 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_05-catalogsource.crd.yaml +# Source: olm/templates/0000_50_05-catalogsource.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -58,11 +58,16 @@ spec: enum: - internal # deprecated - configmap + - grpc configMap: type: string description: The name of a ConfigMap that holds the entries for an in-memory catalog. + image: + type: string + description: An image that serves a grpc registry. Only valid for `grpc` sourceType. + displayName: type: string description: Pretty name for display diff --git a/deploy/okd/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml b/deploy/okd/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml similarity index 94% rename from deploy/okd/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml rename to deploy/okd/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml index b647cd0b5f..66b2308df1 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_10-olm-operator.deployment.yaml +# Source: olm/templates/0000_50_10-olm-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml b/deploy/okd/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml similarity index 94% rename from deploy/okd/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml rename to deploy/okd/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml index 9f5726d611..f73667ade1 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_11-catalog-operator.deployment.yaml +# Source: olm/templates/0000_50_11-catalog-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/manifests/0000_30_12-aggregated.clusterrole.yaml b/deploy/okd/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml similarity index 93% rename from manifests/0000_30_12-aggregated.clusterrole.yaml rename to deploy/okd/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml index e91d70cb0a..adfebe48e6 100644 --- a/manifests/0000_30_12-aggregated.clusterrole.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_12-aggregated.clusterrole.yaml +# Source: olm/templates/0000_50_12-aggregated.clusterrole.yaml kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml b/deploy/okd/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml similarity index 97% rename from deploy/upstream/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml rename to deploy/okd/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml index 995ab2e07e..8faa1bb107 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_13-operatorgroup.crd.yaml +# Source: olm/templates/0000_50_13-operatorgroup.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml b/deploy/okd/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml similarity index 97% rename from deploy/okd/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml rename to deploy/okd/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml index e57ed9101a..30dea32f51 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_14-olm-operators.configmap.yaml +# Source: olm/templates/0000_50_14-olm-operators.configmap.yaml kind: ConfigMap apiVersion: v1 metadata: @@ -18,6 +18,7 @@ data: spec: displayName: Package Server description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion. + minKubeVersion: 1.11.0 keywords: ['packagemanifests', 'olm', 'packages'] maintainers: - name: Red Hat diff --git a/deploy/ocp/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml b/deploy/okd/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml similarity index 84% rename from deploy/ocp/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml rename to deploy/okd/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml index 36190a949a..7e58c26b13 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_15-olm-operators.catalogsource.yaml +# Source: olm/templates/0000_50_15-olm-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml #! parse-kind: CatalogSource apiVersion: operators.coreos.com/v1alpha1 diff --git a/manifests/0000_30_16-operatorgroup-default.yaml b/deploy/okd/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml similarity index 85% rename from manifests/0000_30_16-operatorgroup-default.yaml rename to deploy/okd/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml index 808fa53a60..6a03f0832e 100644 --- a/manifests/0000_30_16-operatorgroup-default.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_16-operatorgroup-default.yaml +# Source: olm/templates/0000_50_16-operatorgroup-default.yaml apiVersion: operators.coreos.com/v1alpha2 kind: OperatorGroup metadata: diff --git a/manifests/0000_30_17-packageserver.subscription.yaml b/deploy/okd/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml similarity index 85% rename from manifests/0000_30_17-packageserver.subscription.yaml rename to deploy/okd/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml index 706c438f14..56ec0dee17 100644 --- a/manifests/0000_30_17-packageserver.subscription.yaml +++ b/deploy/okd/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_17-packageserver.subscription.yaml +# Source: olm/templates/0000_50_17-packageserver.subscription.yaml #! validate-crd: ./deploy/chart/templates/04-subscription.crd.yaml #! parse-kind: Subscription apiVersion: operators.coreos.com/v1alpha1 diff --git a/deploy/upstream/manifests/0.8.1/0000_30_00-namespace.yaml b/deploy/upstream/manifests/0.8.1/0000_50_00-namespace.yaml similarity index 80% rename from deploy/upstream/manifests/0.8.1/0000_30_00-namespace.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_00-namespace.yaml index eea04be798..4cdb70541c 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_00-namespace.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_00-namespace.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_00-namespace.yaml +# Source: olm/templates/0000_50_00-namespace.yaml apiVersion: v1 kind: Namespace metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml b/deploy/upstream/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml similarity index 91% rename from deploy/upstream/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml index e75e22e51b..7ab34cb11e 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_01-olm-operator.serviceaccount.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_01-olm-operator.serviceaccount.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_01-olm-operator.serviceaccount.yaml +# Source: olm/templates/0000_50_01-olm-operator.serviceaccount.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml b/deploy/upstream/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml similarity index 99% rename from deploy/upstream/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml index 55ec962996..f7d8e6bf54 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_02-clusterserviceversion.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_02-clusterserviceversion.crd.yaml +# Source: olm/templates/0000_50_02-clusterserviceversion.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -62,6 +62,10 @@ spec: type: string description: Human readable description of what the application does + minKubeVersion: + type: string + description: Minimum kubernetes version requirement on the server to deploy operator + keywords: type: array description: List of keywords which will be used to discover and categorize app types @@ -200,7 +204,7 @@ spec: description: Version of the API resource kind: type: string - description: Kind of the API resource + description: Kind of the API resource apiservicedefinitions: type: object properties: diff --git a/manifests/0000_30_03-installplan.crd.yaml b/deploy/upstream/manifests/0.8.1/0000_50_03-installplan.crd.yaml similarity index 97% rename from manifests/0000_30_03-installplan.crd.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_03-installplan.crd.yaml index 1cdf63651a..9c48076164 100644 --- a/manifests/0000_30_03-installplan.crd.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_03-installplan.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_03-installplan.crd.yaml +# Source: olm/templates/0000_50_03-installplan.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_04-subscription.crd.yaml b/deploy/upstream/manifests/0.8.1/0000_50_04-subscription.crd.yaml similarity index 97% rename from deploy/okd/manifests/0.8.1/0000_30_04-subscription.crd.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_04-subscription.crd.yaml index 9894ebd30c..5f93f34ace 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_04-subscription.crd.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_04-subscription.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_04-subscription.crd.yaml +# Source: olm/templates/0000_50_04-subscription.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/manifests/0000_30_05-catalogsource.crd.yaml b/deploy/upstream/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml similarity index 94% rename from manifests/0000_30_05-catalogsource.crd.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml index 0b17256bd2..ddb2354515 100644 --- a/manifests/0000_30_05-catalogsource.crd.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_05-catalogsource.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_05-catalogsource.crd.yaml +# Source: olm/templates/0000_50_05-catalogsource.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -58,11 +58,16 @@ spec: enum: - internal # deprecated - configmap + - grpc configMap: type: string description: The name of a ConfigMap that holds the entries for an in-memory catalog. + image: + type: string + description: An image that serves a grpc registry. Only valid for `grpc` sourceType. + displayName: type: string description: Pretty name for display diff --git a/deploy/upstream/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml b/deploy/upstream/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml similarity index 94% rename from deploy/upstream/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml index a57c19c547..00e4f11a7b 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_10-olm-operator.deployment.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_10-olm-operator.deployment.yaml +# Source: olm/templates/0000_50_10-olm-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml b/deploy/upstream/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml similarity index 93% rename from deploy/upstream/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml index 369217eedc..b62113050f 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_11-catalog-operator.deployment.yaml +# Source: olm/templates/0000_50_11-catalog-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml b/deploy/upstream/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml similarity index 93% rename from deploy/okd/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml index e91d70cb0a..adfebe48e6 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_12-aggregated.clusterrole.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_12-aggregated.clusterrole.yaml +# Source: olm/templates/0000_50_12-aggregated.clusterrole.yaml kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml b/deploy/upstream/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml similarity index 97% rename from deploy/ocp/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml index 995ab2e07e..8faa1bb107 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_13-operatorgroup.crd.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_13-operatorgroup.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_13-operatorgroup.crd.yaml +# Source: olm/templates/0000_50_13-operatorgroup.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml b/deploy/upstream/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml similarity index 97% rename from deploy/upstream/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml index 453c5a2d2f..f066833b16 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_14-olm-operators.configmap.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_14-olm-operators.configmap.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_14-olm-operators.configmap.yaml +# Source: olm/templates/0000_50_14-olm-operators.configmap.yaml kind: ConfigMap apiVersion: v1 metadata: @@ -18,6 +18,7 @@ data: spec: displayName: Package Server description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion. + minKubeVersion: 1.11.0 keywords: ['packagemanifests', 'olm', 'packages'] maintainers: - name: Red Hat diff --git a/deploy/upstream/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml b/deploy/upstream/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml similarity index 83% rename from deploy/upstream/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml index 7f50890e57..170f608e04 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_15-olm-operators.catalogsource.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_15-olm-operators.catalogsource.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_15-olm-operators.catalogsource.yaml +# Source: olm/templates/0000_50_15-olm-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml #! parse-kind: CatalogSource apiVersion: operators.coreos.com/v1alpha1 diff --git a/deploy/upstream/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml b/deploy/upstream/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml similarity index 81% rename from deploy/upstream/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml index bd30009a81..1a16653606 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_16-operatorgroup-default.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_16-operatorgroup-default.yaml +# Source: olm/templates/0000_50_16-operatorgroup-default.yaml apiVersion: operators.coreos.com/v1alpha2 kind: OperatorGroup metadata: diff --git a/deploy/upstream/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml b/deploy/upstream/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml similarity index 82% rename from deploy/upstream/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml rename to deploy/upstream/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml index 301e02cc54..10cbf1c19c 100644 --- a/deploy/upstream/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml +++ b/deploy/upstream/manifests/0.8.1/0000_50_17-packageserver.subscription.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_17-packageserver.subscription.yaml +# Source: olm/templates/0000_50_17-packageserver.subscription.yaml #! validate-crd: ./deploy/chart/templates/04-subscription.crd.yaml #! parse-kind: Subscription apiVersion: operators.coreos.com/v1alpha1 diff --git a/deploy/okd/manifests/0.8.1/0000_30_00-namespace.yaml b/manifests/0000_50_00-namespace.yaml similarity index 83% rename from deploy/okd/manifests/0.8.1/0000_30_00-namespace.yaml rename to manifests/0000_50_00-namespace.yaml index e09ac2c0a3..3826583ee0 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_00-namespace.yaml +++ b/manifests/0000_50_00-namespace.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_00-namespace.yaml +# Source: olm/templates/0000_50_00-namespace.yaml apiVersion: v1 kind: Namespace metadata: diff --git a/manifests/0000_30_01-olm-operator.serviceaccount.yaml b/manifests/0000_50_01-olm-operator.serviceaccount.yaml similarity index 92% rename from manifests/0000_30_01-olm-operator.serviceaccount.yaml rename to manifests/0000_50_01-olm-operator.serviceaccount.yaml index 8ab035f630..0aeece80a7 100644 --- a/manifests/0000_30_01-olm-operator.serviceaccount.yaml +++ b/manifests/0000_50_01-olm-operator.serviceaccount.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_01-olm-operator.serviceaccount.yaml +# Source: olm/templates/0000_50_01-olm-operator.serviceaccount.yaml apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml b/manifests/0000_50_02-clusterserviceversion.crd.yaml similarity index 99% rename from deploy/ocp/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml rename to manifests/0000_50_02-clusterserviceversion.crd.yaml index 55ec962996..f7d8e6bf54 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_02-clusterserviceversion.crd.yaml +++ b/manifests/0000_50_02-clusterserviceversion.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_02-clusterserviceversion.crd.yaml +# Source: olm/templates/0000_50_02-clusterserviceversion.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -62,6 +62,10 @@ spec: type: string description: Human readable description of what the application does + minKubeVersion: + type: string + description: Minimum kubernetes version requirement on the server to deploy operator + keywords: type: array description: List of keywords which will be used to discover and categorize app types @@ -200,7 +204,7 @@ spec: description: Version of the API resource kind: type: string - description: Kind of the API resource + description: Kind of the API resource apiservicedefinitions: type: object properties: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_03-installplan.crd.yaml b/manifests/0000_50_03-installplan.crd.yaml similarity index 97% rename from deploy/ocp/manifests/0.8.1/0000_30_03-installplan.crd.yaml rename to manifests/0000_50_03-installplan.crd.yaml index 1cdf63651a..9c48076164 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_03-installplan.crd.yaml +++ b/manifests/0000_50_03-installplan.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_03-installplan.crd.yaml +# Source: olm/templates/0000_50_03-installplan.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/manifests/0000_30_04-subscription.crd.yaml b/manifests/0000_50_04-subscription.crd.yaml similarity index 97% rename from manifests/0000_30_04-subscription.crd.yaml rename to manifests/0000_50_04-subscription.crd.yaml index 9894ebd30c..5f93f34ace 100644 --- a/manifests/0000_30_04-subscription.crd.yaml +++ b/manifests/0000_50_04-subscription.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_04-subscription.crd.yaml +# Source: olm/templates/0000_50_04-subscription.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml b/manifests/0000_50_05-catalogsource.crd.yaml similarity index 94% rename from deploy/okd/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml rename to manifests/0000_50_05-catalogsource.crd.yaml index 0b17256bd2..ddb2354515 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_05-catalogsource.crd.yaml +++ b/manifests/0000_50_05-catalogsource.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_05-catalogsource.crd.yaml +# Source: olm/templates/0000_50_05-catalogsource.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -58,11 +58,16 @@ spec: enum: - internal # deprecated - configmap + - grpc configMap: type: string description: The name of a ConfigMap that holds the entries for an in-memory catalog. + image: + type: string + description: An image that serves a grpc registry. Only valid for `grpc` sourceType. + displayName: type: string description: Pretty name for display diff --git a/manifests/0000_30_10-olm-operator.deployment.yaml b/manifests/0000_50_10-olm-operator.deployment.yaml similarity index 95% rename from manifests/0000_30_10-olm-operator.deployment.yaml rename to manifests/0000_50_10-olm-operator.deployment.yaml index 25ff5098a7..9f176dce4b 100644 --- a/manifests/0000_30_10-olm-operator.deployment.yaml +++ b/manifests/0000_50_10-olm-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_10-olm-operator.deployment.yaml +# Source: olm/templates/0000_50_10-olm-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml b/manifests/0000_50_11-catalog-operator.deployment.yaml similarity index 94% rename from deploy/ocp/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml rename to manifests/0000_50_11-catalog-operator.deployment.yaml index 7a114a4015..5662195926 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_11-catalog-operator.deployment.yaml +++ b/manifests/0000_50_11-catalog-operator.deployment.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_11-catalog-operator.deployment.yaml +# Source: olm/templates/0000_50_11-catalog-operator.deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: diff --git a/deploy/ocp/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml b/manifests/0000_50_12-aggregated.clusterrole.yaml similarity index 93% rename from deploy/ocp/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml rename to manifests/0000_50_12-aggregated.clusterrole.yaml index e91d70cb0a..adfebe48e6 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_12-aggregated.clusterrole.yaml +++ b/manifests/0000_50_12-aggregated.clusterrole.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_12-aggregated.clusterrole.yaml +# Source: olm/templates/0000_50_12-aggregated.clusterrole.yaml kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/manifests/0000_30_13-operatorgroup.crd.yaml b/manifests/0000_50_13-operatorgroup.crd.yaml similarity index 97% rename from manifests/0000_30_13-operatorgroup.crd.yaml rename to manifests/0000_50_13-operatorgroup.crd.yaml index 995ab2e07e..8faa1bb107 100644 --- a/manifests/0000_30_13-operatorgroup.crd.yaml +++ b/manifests/0000_50_13-operatorgroup.crd.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_13-operatorgroup.crd.yaml +# Source: olm/templates/0000_50_13-operatorgroup.crd.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/manifests/0000_30_14-olm-operators.configmap.yaml b/manifests/0000_50_14-olm-operators.configmap.yaml similarity index 97% rename from manifests/0000_30_14-olm-operators.configmap.yaml rename to manifests/0000_50_14-olm-operators.configmap.yaml index b944670740..09857a6ab7 100644 --- a/manifests/0000_30_14-olm-operators.configmap.yaml +++ b/manifests/0000_50_14-olm-operators.configmap.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_14-olm-operators.configmap.yaml +# Source: olm/templates/0000_50_14-olm-operators.configmap.yaml kind: ConfigMap apiVersion: v1 metadata: @@ -18,6 +18,7 @@ data: spec: displayName: Package Server description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion. + minKubeVersion: 1.11.0 keywords: ['packagemanifests', 'olm', 'packages'] maintainers: - name: Red Hat diff --git a/manifests/0000_30_15-olm-operators.catalogsource.yaml b/manifests/0000_50_15-olm-operators.catalogsource.yaml similarity index 84% rename from manifests/0000_30_15-olm-operators.catalogsource.yaml rename to manifests/0000_50_15-olm-operators.catalogsource.yaml index 36190a949a..7e58c26b13 100644 --- a/manifests/0000_30_15-olm-operators.catalogsource.yaml +++ b/manifests/0000_50_15-olm-operators.catalogsource.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_15-olm-operators.catalogsource.yaml +# Source: olm/templates/0000_50_15-olm-operators.catalogsource.yaml #! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml #! parse-kind: CatalogSource apiVersion: operators.coreos.com/v1alpha1 diff --git a/deploy/ocp/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml b/manifests/0000_50_16-operatorgroup-default.yaml similarity index 85% rename from deploy/ocp/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml rename to manifests/0000_50_16-operatorgroup-default.yaml index 808fa53a60..6a03f0832e 100644 --- a/deploy/ocp/manifests/0.8.1/0000_30_16-operatorgroup-default.yaml +++ b/manifests/0000_50_16-operatorgroup-default.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_16-operatorgroup-default.yaml +# Source: olm/templates/0000_50_16-operatorgroup-default.yaml apiVersion: operators.coreos.com/v1alpha2 kind: OperatorGroup metadata: diff --git a/deploy/okd/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml b/manifests/0000_50_17-packageserver.subscription.yaml similarity index 85% rename from deploy/okd/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml rename to manifests/0000_50_17-packageserver.subscription.yaml index 706c438f14..56ec0dee17 100644 --- a/deploy/okd/manifests/0.8.1/0000_30_17-packageserver.subscription.yaml +++ b/manifests/0000_50_17-packageserver.subscription.yaml @@ -1,5 +1,5 @@ ##--- -# Source: olm/templates/0000_30_17-packageserver.subscription.yaml +# Source: olm/templates/0000_50_17-packageserver.subscription.yaml #! validate-crd: ./deploy/chart/templates/04-subscription.crd.yaml #! parse-kind: Subscription apiVersion: operators.coreos.com/v1alpha1