Skip to content

Commit

Permalink
Merge pull request #678 from ecordell/change-runlevel
Browse files Browse the repository at this point in the history
chore(deploy): change 30 prefix to 50
  • Loading branch information
openshift-merge-robot authored Jan 22, 2019
2 parents a36ed09 + f0e86b8 commit c7ee4c5
Show file tree
Hide file tree
Showing 70 changed files with 95 additions and 59 deletions.
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit c7ee4c5

Please sign in to comment.