Skip to content

Commit

Permalink
feat(subscriptions): requeue dependent Subscriptions on CatalogSource
Browse files Browse the repository at this point in the history
sync
  • Loading branch information
njhale committed Dec 7, 2018
1 parent 323a26a commit d1b73c0
Show file tree
Hide file tree
Showing 27 changed files with 1,147 additions and 28 deletions.
80 changes: 80 additions & 0 deletions deploy/ocp/manifests/0.8.0/0000_30_13-operatorgroup.crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
# Source: olm/templates/0000_30_13-operatorgroup.crd.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: operatorgroups.operators.coreos.com
spec:
group: operators.coreos.com
version: v1alpha2
versions:
- name: v1alpha2
served: true
storage: true
names:
plural: operatorgroups
singular: operatorgroup
kind: OperatorGroup
listKind: OperatorGroupList
scope: Namespaced
subresources:
# status enables the status subresource.
status: {}
validation:
openAPIV3Schema:
properties:
spec:
properties:
selector:
type: object
description: Label selector to find resources associated with or managed by the operator
properties:
matchLabels:
type: object
description: Label key:value pairs to match directly
matchExpressions:
type: array
description: A set of expressions to match against the resource.
items:
allOf:
- type: object
required:
- key
- operator
- values
properties:
key:
type: string
description: the key to match
operator:
type: string
description: the operator for the expression
enum:
- In
- NotIn
- Exists
- DoesNotExist
values:
type: array
description: set of values for the expression
serviceAccountName:
type: string
required:
- selector
type: object
status:
properties:
lastUpdated:
format: date-time
type: string
namespaces:
items:
type: string
type: array
required:
- namespaces
- lastUpdated
type: object
required:
- metadata
- spec
121 changes: 121 additions & 0 deletions deploy/ocp/manifests/0.8.0/0000_30_14-olm-operators.configmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
---
# Source: olm/templates/0000_30_14-olm-operators.configmap.yaml
kind: ConfigMap
apiVersion: v1
metadata:
name: olm-operators
namespace: openshift-operator-lifecycle-manager

data:
customResourceDefinitions: |-
clusterServiceVersions: |-
- apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
name: packageserver.v0.8.0
namespace: openshift-operator-lifecycle-manager
spec:
displayName: Package Server
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
keywords: ['packagemanifests', 'olm', 'packages']
maintainers:
- name: Red Hat
email: [email protected]
provider:
name: Red Hat
links:
- name: Package Server
url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/packageserver
install:
strategy: deployment
spec:
permissions:
- serviceAccountName: packageserver
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- watch
- apiGroups:
- "operators.coreos.com"
resources:
- catalogsources
verbs:
- get
- list
- watch
- apiGroups:
- "packages.apps.redhat.com"
resources:
- packagemanifests
verbs:
- get
- list
- watch
- create
- delete
- patch
- update
deployments:
- name: packageserver
spec:
replicas: 1
strategy:
type: RollingUpdate
selector:
matchLabels:
app: packageserver
template:
metadata:
labels:
app: packageserver
spec:
serviceAccountName: packageserver
containers:
- name: packageserver
command:
- /bin/package-server
- -v=4
- --secure-port
- "5443"
- --global-namespace
- openshift-operator-lifecycle-manager
image: quay.io/coreos/olm@sha256:1639d570809c5827810a1870763016e8c046283632d47e0b47183c82f8e515f2
imagePullPolicy: Always
ports:
- containerPort: 5443
livenessProbe:
httpGet:
scheme: HTTPS
path: /healthz
port: 5443
readinessProbe:
httpGet:
scheme: HTTPS
path: /healthz
port: 5443
maturity: alpha
version: 0.8.0
apiservicedefinitions:
owned:
- group: packages.apps.redhat.com
version: v1alpha1
kind: PackageManifest
displayName: PackageManifest
description: A PackageManifest is a resource generated from existing CatalogSources and their ConfigMaps
deploymentName: packageserver
containerPort: 5443
packages: |-
- packageName: packageserver
channels:
- name: alpha
currentCSV: packageserver.v0.8.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
# Source: olm/templates/0000_30_15-olm-operators.catalogsource.yaml
#! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml
#! parse-kind: CatalogSource
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: olm-operators
namespace: openshift-operator-lifecycle-manager
spec:
sourceType: internal
configMap: olm-operators
displayName: OLM Operators
publisher: Red Hat
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
# Source: olm/templates/0000_30_16-packageserver.subscription.yaml
#! validate-crd: ./deploy/chart/templates/04-subscription.crd.yaml
#! parse-kind: Subscription
apiVersion: operators.coreos.com/v1alpha1
kind: Subscription
metadata:
name: packageserver
namespace: openshift-operator-lifecycle-manager
spec:
source: olm-operators
name: packageserver
channel: alpha
2 changes: 1 addition & 1 deletion deploy/ocp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ package:
internalPort: 5443
catalog_sources:
- rh-operators
- certified-operators
- certified-operators
80 changes: 80 additions & 0 deletions deploy/okd/manifests/0.8.0/0000_30_13-operatorgroup.crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
# Source: olm/templates/0000_30_13-operatorgroup.crd.yaml
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: operatorgroups.operators.coreos.com
spec:
group: operators.coreos.com
version: v1alpha2
versions:
- name: v1alpha2
served: true
storage: true
names:
plural: operatorgroups
singular: operatorgroup
kind: OperatorGroup
listKind: OperatorGroupList
scope: Namespaced
subresources:
# status enables the status subresource.
status: {}
validation:
openAPIV3Schema:
properties:
spec:
properties:
selector:
type: object
description: Label selector to find resources associated with or managed by the operator
properties:
matchLabels:
type: object
description: Label key:value pairs to match directly
matchExpressions:
type: array
description: A set of expressions to match against the resource.
items:
allOf:
- type: object
required:
- key
- operator
- values
properties:
key:
type: string
description: the key to match
operator:
type: string
description: the operator for the expression
enum:
- In
- NotIn
- Exists
- DoesNotExist
values:
type: array
description: set of values for the expression
serviceAccountName:
type: string
required:
- selector
type: object
status:
properties:
lastUpdated:
format: date-time
type: string
namespaces:
items:
type: string
type: array
required:
- namespaces
- lastUpdated
type: object
required:
- metadata
- spec
Loading

0 comments on commit d1b73c0

Please sign in to comment.