Skip to content

Commit

Permalink
Merge pull request operator-framework#484 from ecordell/fix-manifests
Browse files Browse the repository at this point in the history
re-cut 0.7.1
  • Loading branch information
openshift-merge-robot authored Sep 26, 2018
2 parents 7658b3f + c5b0384 commit 6f3bf9b
Show file tree
Hide file tree
Showing 45 changed files with 12,502 additions and 54 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ RUN make build

FROM openshift/origin-base

ADD manifests/ /manifests
LABEL io.openshift.release.operator=true

# Copy the binary to a standard location where it will run.
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/olm /bin/olm
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ release:
$(MAKE) target=upstream ver=$(ver) package
$(MAKE) target=okd ver=$(ver) package
$(MAKE) target=ocp ver=$(ver) package
rm -rf manifests
mkdir manifests
cp -R deploy/ocp/manifests/$(ver)/. manifests

package:
ifndef target
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion deploy/ocp/manifests/0.7.1/30_00-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: operator-lifecycle-manager
name: openshift-operator-lifecycle-manager
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ kind: ServiceAccount
apiVersion: v1
metadata:
name: olm-operator-serviceaccount
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: olm-operator-binding-operator-lifecycle-manager
name: olm-operator-binding-openshift-operator-lifecycle-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:controller:operator-lifecycle-manager
subjects:
- kind: ServiceAccount
name: olm-operator-serviceaccount
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
45 changes: 45 additions & 0 deletions deploy/ocp/manifests/0.7.1/30_02-clusterserviceversion.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,51 @@ spec:
- patch
- delete
- deletecollection
clusterPermissions:
type: array
description: Cluster permissions needed by the deployement to run correctly
items:
type: object
required:
- serviceAccountName
- rules
properties:
serviceAccountName:
type: string
description: The service account name to create for the deployment
rules:
type: array
items:
type: object
description: a rule required by the service account
properties:
apiGroups:
type: array
description: apiGroups the rule applies to
items:
type: string
resources:
type: array
items:
type: string
resourceNames:
type: array
items:
type: string
verbs:
type: array
items:
type: string
enum:
- "*"
- get
- list
- watch
- create
- update
- patch
- delete
- deletecollection
status:
type: object
description: Status for a ClusterServiceVersion
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ConfigMap
apiVersion: v1
metadata:
name: rh-operators
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager

data:
customResourceDefinitions: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ConfigMap
apiVersion: v1
metadata:
name: certified-operators
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager

data:
customResourceDefinitions: |-
Expand Down Expand Up @@ -780,7 +780,7 @@ data:
- monitoring
displayName: Dynatrace OneAgent
provider:
name: 'Dynatrace, Inc'
name: 'Dynatrace LLC'
maturity: stable
version: 0.2.0
icon:
Expand Down Expand Up @@ -878,7 +878,7 @@ data:
strategy: deployment
maintainers:
- email: support@dynatrace.com
name: 'Dynatrace, Inc'
name: 'Dynatrace LLC'
description: >
Install full-stack monitoring of [OpenShift
clusters](https://www.dynatrace.com/technologies/openshift-monitoring/) with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: certified-operators
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
spec:
sourceType: internal
configMap: certified-operators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: rh-operators
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
spec:
sourceType: internal
configMap: rh-operators
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: olm-operator
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
labels:
app: olm-operator
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: catalog-operator
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
labels:
app: catalog-operator
spec:
Expand All @@ -25,7 +25,7 @@ spec:
command:
- /bin/catalog
- '-namespace'
- operator-lifecycle-manager
- openshift-operator-lifecycle-manager
- '-debug'
image: quay.io/coreos/catalog@sha256:57eb45f2a519c65041d3fad0d7a5199f2ce5ba6a72992606ec4839d3307c5b5f
imagePullPolicy: IfNotPresent
Expand Down
22 changes: 11 additions & 11 deletions deploy/ocp/manifests/0.7.1/30_13-packageserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ kind: APIService
metadata:
name: v1alpha1.packages.apps.redhat.com
spec:
caBundle: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM5VENDQWQyZ0F3SUJBZ0lCQVRBTkJna3Foa2lHOXcwQkFRc0ZBREFjTVJvd0dBWURWUVFERXhGd1lXTnIKWVdkbExYTmxjblpsY2kxallUQWVGdzB4T0RBNU1qQXhNekU1TkROYUZ3MHlPREE1TVRjeE16RTVORE5hTUJ3eApHakFZQmdOVkJBTVRFWEJoWTJ0aFoyVXRjMlZ5ZG1WeUxXTmhNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DCkFROEFNSUlCQ2dLQ0FRRUF2RVpGRlRyaTAxSnlqcHU1L1NyaG9MYWw1dHJ3UDcvUTFIdkdQRlAyR2dlNjd6OWQKWDFkV1c4dmhQRU03Zi9Ua056eU9qNHNWTlZRWmVFSzlZa0NsZHRTSDhOcFVzcTk5cnpXMFZCeXdlRHVsRFRtVApEeWt5UFFmMXlqNHdDcXZ3WGNOWW5aeFZMNndXbFgyY2o3S2hzQzhGMmtBMlY1cFFKS21DZ01aaFBKeEVYa1hpCmNDNlhQM0lQTWkwVDN1c0pPa0JZUHdBNzJWUjF6ekdnc1JaSGFDVVJqWUVHcURndFlqcW9sdHQ5T1RXSnRNMG8KT0RmVEtKeVdMcnFabllPSXdBcDlOcGYzdjJpaHd1d28zZ0k5U2tvS1RBeng0NDhFOFB3NWF1ZkRzSzg5dmd3YwoyTVh4WldENHh2UEs4RkYrTzIrMXJyTFlKSUhVL3M3ZDlTWlF6d0lEQVFBQm8wSXdRREFPQmdOVkhROEJBZjhFCkJBTUNBcVF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0dBUVVGQndNQ01BOEdBMVVkRXdFQi93UUYKTUFNQkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQWdxMXhmVW9aK0R1RndNSkVRaC9mc0huSVdzekp5bQprTFNnWGd0blRDL3VxTWhvdUVxWktmbWRTVkdqM2l6ZXFrSVF0MDJMTDR2UkdnSk5yMXZENmFFSFQwS2ViVkluCkpZT1ZGYmNCVG9lWlBKdXpqZWZzN1lwajAzb0cvTkRUa2VaNmNPY0hvK3hUdklIOVhXaVNOQ1lsUk9FSTFPYXoKL1BTejM1V040ZlFlNWErbDYydDFSZ3F1M1lLaHhDaGNISVFvaDVlQUc5TEcxcHRXUlZFQXhhc09hVmxtMGpKVQp1SHpTYlY4cG1vL1JRUzArcDFkMllIVnFsemN1MW9aMUlIRlhzYXRGekNubkozSkVoOEFjM0VUS3pWSWRpd2FFCjljYjdNMEhpS0tmNXZyWTNIemZpWWZ3RkxxR2tIV2pnTEx5Qm5lcFh5Qi9EbDEyRGR6a2xYa2M9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
caBundle: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM5VENDQWQyZ0F3SUJBZ0lCQVRBTkJna3Foa2lHOXcwQkFRc0ZBREFjTVJvd0dBWURWUVFERXhGd1lXTnIKWVdkbExYTmxjblpsY2kxallUQWVGdzB4T0RBNU1qWXhPVFUyTkRCYUZ3MHlPREE1TWpNeE9UVTJOREJhTUJ3eApHakFZQmdOVkJBTVRFWEJoWTJ0aFoyVXRjMlZ5ZG1WeUxXTmhNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DCkFROEFNSUlCQ2dLQ0FRRUFxYXZtWlpBM1M3Nkx5YWRNMHFmSU1CK25lWm1PVDI0KzFHL2g2WlUyZjl3OGhZMVkKdGc1YUgrQzN4SDFxMnV4TE9mcFE1YWVCdDhvd3JXSUN1MUJycEhUUXdpSjZpY0dXUVBFcXN6OUsxYzNXMlo5QwplKzAwSmpOSmcrVDVsSi9vVFRMaEFDelRGYXdYWGtMdngraDA5b1g3dEJIOVdQYS9QNy9hQU1ldWp5ZklmOGxsClF4VFFSUEMzR243ZUtXYXdPbjhPQ1haOElENzhyYmw2V2xGL3B6UmZyL0FWRHIxN1h4SmlaQUhhbmk4R0xMbGYKSHVnUFVSOUptUExCcHlyZ0tiRmFvbzlWU3loVUZVcXd0ZG4xZHR4Qmcrb2JJTEs4aVlnTnY1Tm50OWU2bE11agpRZE9XVUtlWFVuaEpldTV6ZkVaR3BJalVOOHBiSjdkamNYV21JUUlEQVFBQm8wSXdRREFPQmdOVkhROEJBZjhFCkJBTUNBcVF3SFFZRFZSMGxCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0dBUVVGQndNQ01BOEdBMVVkRXdFQi93UUYKTUFNQkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRWtYTUJqaW5paGNhZUpKZlpDTzUrM0t4UFhKT3U3bwo1blFCblBWZVZQSWtDSUVOMlhlRVQwekcyTUJieGU2RWJ1U1o4MDJBU25iQk5JRWJXUStiYUlucjdaTjErcHpuCmVValViZDNJY2hERDA2MDFpejRwWWpiOGI2NVNnTFhTamFYZDc4aFQwcEkvQ1o3UDVSY3hyR2RRcjBOT09RRUMKbG5nR05GWXdHNWFpeDluZWtPeXBlU2F0ekxhSTh4SUQ4RTVQdUJzOGdRdUJrUGpESDkrRTVHcXprY09vczNqUApQWHdoTCtXdHpqVXQ3cFBZalhYemovYkU5OVNPSHl6K3BoSXFnTWxhYkVJMWJPRlp1Rm1WdEJzUzErZjNaM1BqCmNYdDR1LzN6VCtpeWZUVGI2KzJNeW56RjhFbm5EejE3bThPOEJJSzliNCt2UjdpbVQ1S0RJVzQ9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
group: packages.apps.redhat.com
groupPriorityMinimum: 2000
versionPriority: 15
service:
name: package-server
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
version: v1alpha1
---
apiVersion: rbac.authorization.k8s.io/v1
Expand All @@ -25,7 +25,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: olm-operator-serviceaccount
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand All @@ -39,7 +39,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: olm-operator-serviceaccount
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -52,7 +52,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: olm-operator-serviceaccount
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand All @@ -65,25 +65,25 @@ roleRef:
subjects:
- kind: ServiceAccount
name: olm-operator-serviceaccount
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
---
apiVersion: v1
kind: Secret
type: kubernetes.io/tls
metadata:
name: package-server-certs
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
labels:
app: package-server
data:
tls.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWakNDQWo2Z0F3SUJBZ0lCQVRBTkJna3Foa2lHOXcwQkFRc0ZBREFjTVJvd0dBWURWUVFERXhGd1lXTnIKWVdkbExYTmxjblpsY2kxallUQWVGdzB4T0RBNU1qQXhNekU1TkROYUZ3MHhPVEE1TWpBeE16RTVORE5hTUJreApGekFWQmdOVkJBTVREbkJoWTJ0aFoyVXRjMlZ5ZG1WeU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBCk1JSUJDZ0tDQVFFQTM1OWhjSjEzMUNTME5Oc0tzcW9Ic1RTaW84NGtIUUZMRjdzVm14L2pkOVo1ZXNUNEp0NkcKSFN6NTZLVVV4M1pOb09WVGV1NDA3U0t0Y2lSbXBaeEw1M2FOS0N2R2JEWlFBRk5HTTA5NlV3OVBBbmRNS3B2dApmSlpHc2lNdjRYR1JnVW16ZHZjMFZCa3JoK0hzcDhYUVhtMW0rcm1qS2pyc3JOeG9DT2FIQ2EvVDlHOG1TQkVaCkRUaDlMK1BTMDJJaHZaVmUvTTZMamhaSEdWUVRUZjRiTkNaWnVhWWhsQ293Z1ZuU3BpMWtnTkF5djZMNmdSTXQKRWhyMFNDKy9DK1dKdWxJSTJ3Mzl5N2xSTHZrVzRsWGNFUDQzdG1ZdzVkUFREWFRLOWYzL2V3WXN1SXQvV2lYUwpGRWdBRDQrU0p2aStGTzVCbGhFSEE5Wm5Hc2Y1T05OZEZRSURBUUFCbzRHbE1JR2lNQTRHQTFVZER3RUIvd1FFCkF3SUZvREFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0RBWURWUjBUQVFIL0JBSXcKQURCakJnTlZIUkVFWERCYWdpbHdZV05yWVdkbExYTmxjblpsY2k1dmNHVnlZWFJ2Y2kxc2FXWmxZM2xqYkdVdApiV0Z1WVdkbGNvSXRjR0ZqYTJGblpTMXpaWEoyWlhJdWIzQmxjbUYwYjNJdGJHbG1aV041WTJ4bExXMWhibUZuClpYSXVjM1pqTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFDM2p1UGdCSHdJME85MjI5YnBkTWRVcCtkVkh3cVEKNkNER2xFekNORzlBaDJQUWtSc0hXU0xjandhMmkyeHBmbE93UUJUanRtSEs4QlFxclhMdGNibUZiV2pPU1FHSwpLWW1sS1VNdUpkZFVQSzE4WW5MSi9CYW5ySThNcHg0dkZkeHNKWFdEcUdkZzFGZXVGY0U0TGlZSUxPcFVocjY5ClF5VHFxZkNzbW1SaXNiaFVwZzliSHllUHhrQlRZZEhqQStlbis2YlkwaHk3b2xQYzZpeHZCV2lRS3JlR2k4eXEKU1RTS2xvWmtvSDhYYUs4SDFUN1NlZmpCRG43UUJYV0lMaWRTRVZ1YjJxUXdNbzdLSVYxNzc4aXBXODhseXVtZgplNEJkUUVjZU5zc01GOG41S2xZSWZKZGtPRXhzamVWc2hnMTArbFpyczZMRy80c3JBbzhvQy9KdwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
tls.key: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBMzU5aGNKMTMxQ1MwTk5zS3Nxb0hzVFNpbzg0a0hRRkxGN3NWbXgvamQ5WjVlc1Q0Ckp0NkdIU3o1NktVVXgzWk5vT1ZUZXU0MDdTS3RjaVJtcFp4TDUzYU5LQ3ZHYkRaUUFGTkdNMDk2VXc5UEFuZE0KS3B2dGZKWkdzaU12NFhHUmdVbXpkdmMwVkJrcmgrSHNwOFhRWG0xbStybWpLanJzck54b0NPYUhDYS9UOUc4bQpTQkVaRFRoOUwrUFMwMklodlpWZS9NNkxqaFpIR1ZRVFRmNGJOQ1padWFZaGxDb3dnVm5TcGkxa2dOQXl2Nkw2CmdSTXRFaHIwU0MrL0MrV0p1bElJMnczOXk3bFJMdmtXNGxYY0VQNDN0bVl3NWRQVERYVEs5ZjMvZXdZc3VJdC8KV2lYU0ZFZ0FENCtTSnZpK0ZPNUJsaEVIQTlabkdzZjVPTk5kRlFJREFRQUJBb0lCQUFPU2tVVHlUeExGajFkMAoxR1BzVVhra1JTRG16eTdqY1dhc3AzaTE5clZZYU5Kc1NTYWQwWGl2MmtJOE9PdkMyUlNqOVVSMmY4UDJGTjFJCjlaYlp1MkMwUlNjS0kvNWdrOENkay9hSDQ0Vm1MalgwMy9PaVVCWDRkS0t0NnpybnpKSkxNaUhKYXoyWXRWaFQKWkt0OWZvbXpwN3lEc0xhaEFGejJuSGJmNy9KWXBCNFBRUjE0ZzJWb2IrSjg0KzB5YVZ5d0FCbW1CU0hrUGNpegpjRjFOQW0wczhkakRaZlIxQk9FWjc1UmtqS0NyeDZxdG9QWlJhdkQ5dVVBYk5ISmJ3TGYyZW0xZW01MGlqamwwCnFWM0pBWGZQQWZqWG9QSlhqcEpxa28yZDZ5V0p1WENyRkVmeG12WTNNTzl1djFJRlJaaWJZUjhiUVU5ZzZVMHEKRk9uamgwRUNnWUVBN1h1aEdISER3WUpMS0k3QmdKVjRsOVFDVlJwVHcrTHM3dlExNU13VDE3WnlReVphbmFscwpPaU85K2lZUlFldnVGQjJQTndZd0NUeC9FWlAyRDR3SUhieFRUbktQOGNJL3ViMXJJS1FnTE1TWXUraTJET0pvCjhGWm9VSFlMVU5hc1JuOUV6azd4NzJBZ29QMFZja1ZaQ0lNSjFNZCs1NE5VcmNsc3NoUzd5VEVDZ1lFQThROFcKSkNlUjFqZVhNVEd4Z0c2N01LU0kwamtCanJoR0IvWGZrbFNXOC9zTG5kd1pOeTFCTGxRZVB4ME5kYWtUNnE5ego4WFhuZWtwU09zUzlsYkE2ajRQdjlsbVJuSnFyMzFPQ0JrVjBONGpyQ2VZOGlqbVRRQitwdEdia2p2MGpuN1dhCmtmeFF3cmVLSGFMUWZ3MCsrazVwL2l1aTVHdXJYbGVldmpsQm1TVUNnWUI2RktXNXhUSFdsajVBdVRJc0FhcWUKa2pRb3Y0SDBId0doelJTdmEyRi84S0JJZUx6NGM1SFpTV3B0MzRmYmxZY3IvQTRWUVM4TWNIYjUrRS96cWc2NgpDb2ZndWUvWlhmd1laWkZlbEVDZUF1cHBIcllIWlpTQWlFclRvZnNyTVZBYVpXNWZpQ0hDNW0yZmxMcWpwWmFoClU0dUlRSTJ5UWNjVUY0bXkrZ21XNFFLQmdRREFSSGcwZmhzajhWTDJPZHlKdzhncUZCSE5Hd3JTK3NkZ3NndVEKZTBlcmNpRGgyQnVFbHVQV1ArR2dGVndXN0xTbUN5cysrL3VVM3BLWHJUUkpvRFlWSWZiVFZyMTlXeUNiRDlBMQprRkFSdTNNOGdoYm5hT1M1MElkYkRIWmdWaWVEeXlWdUt3Ri9UVVVzUGlCdU5mSjFVdlhYZEphSCtoakZOcjIyCm01Um13UUtCZ0FkYzJ3dks2djZ4c2xrb0xCb1lFNEJLb3MzMCtUKzdLd3NKVHR0RnpTZG1taENYeklNaFc1VDIKTjZFODQ3UkhvQS9Xbmo2ckxCQWhCOUI4VUFwYVVBN2UzNE9CT1JYd01xNkZEbUxuRElpa0NGVHR6Nk1xYXJGRApjYkFWTHFveVBQTFVmcEpLMkJqZ20wSCtWQ3lBaWVzM1dueXR5SFlwVnlCZHQ5RURmTzZuCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg=="
tls.crt: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhakNDQWxLZ0F3SUJBZ0lCQVRBTkJna3Foa2lHOXcwQkFRc0ZBREFjTVJvd0dBWURWUVFERXhGd1lXTnIKWVdkbExYTmxjblpsY2kxallUQWVGdzB4T0RBNU1qWXhPVFUyTkRCYUZ3MHhPVEE1TWpZeE9UVTJOREJhTUJreApGekFWQmdOVkJBTVREbkJoWTJ0aFoyVXRjMlZ5ZG1WeU1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBCk1JSUJDZ0tDQVFFQXlJWnl5ZzQxdllCUjQrSEhLbXg3dFFBNVF0U1Y1dEp4NHY0Wk9HTndQdUh4UkFkUnBva2wKV2FiNVh4US9PdWtZUTYrWWozVWFwTlhYWGgwenNGQy9uWHJDYTVKeDNhOXZMOXdvVWNaLzhoNFFGSmlYbFJnSApLZFhKYjZpWVdtU0lMK0JsTFpWMXA3RDZ5WVZ5N0tFV3o4NGw2Vkd4alduTkE3VXRPcm90MVZMN3NncEZUVXRLCjBLOW00TGs3dm53eExseldHSGFhZ3hLYXRFbHZQVk40WXlqV0NrOHFOMTc5SHhFMFduYUpuTjIzMUJtdVVhM3kKM05zUEtrZG1oYXNEcmM5aUQwczB0R1ZoZWhnZ1dOTDlSek5ucGI4ZUZGR0oxQkRKbzNTb1lhSnBuNXBETVNYRAo2M0JzN1JoYWhZaU5tQ3NqRVFHcVlFZi9lbFV5dk9iWmh3SURBUUFCbzRHNU1JRzJNQTRHQTFVZER3RUIvd1FFCkF3SUZvREFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0RBWURWUjBUQVFIL0JBSXcKQURCM0JnTlZIUkVFY0RCdWdqTndZV05yWVdkbExYTmxjblpsY2k1dmNHVnVjMmhwWm5RdGIzQmxjbUYwYjNJdApiR2xtWldONVkyeGxMVzFoYm1GblpYS0NOM0JoWTJ0aFoyVXRjMlZ5ZG1WeUxtOXdaVzV6YUdsbWRDMXZjR1Z5CllYUnZjaTFzYVdabFkzbGpiR1V0YldGdVlXZGxjaTV6ZG1Nd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJMkEKN1ZPdWFXeWp5Y3FIR2h3SjFhK281MlpEZjNvejZYZFdoZFFuZFVwQ1gxcTBqT2Y5d0t5LzJpS0VIQUdrRmhhbgpTNGxPZU50M2NWWEFTVlV1Wnl6SUZrd1lob3FVZk10T2J5aDdSdHRMdzhYeFFSMXVXemkvUzJIRG4wemdNL1F3ClB1Wk1YMVJBcEo1TUd1cTNsandNaTZCT2d2OEI1UVVWTzB0UUZvTm1MUTFidmlqaEhneFFaTEZ6VWUrL0wwcncKQWx0TXIxSTNzMGZIcFg4SWJIYkFJb2RDSnI3VDYyaXRVMHV4NHpiemZieklLcUdhYm1kY0NsaGR6cTduY01DQgp3ZE5XSjlqQzZqQ0FMN0xIRGRzVmxXSlNUQXlIY2lhenBSVlMzQ0FCRDZydHBDcDJhbmNSUzZOS1hCZHl2REdPCnFqaUtuWVFRNnUrT3d6ZHN4Qk09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"
tls.key: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeUlaeXlnNDF2WUJSNCtISEtteDd0UUE1UXRTVjV0Sng0djRaT0dOd1B1SHhSQWRSCnBva2xXYWI1WHhRL091a1lRNitZajNVYXBOWFhYaDB6c0ZDL25YckNhNUp4M2E5dkw5d29VY1ovOGg0UUZKaVgKbFJnSEtkWEpiNmlZV21TSUwrQmxMWlYxcDdENnlZVnk3S0VXejg0bDZWR3hqV25OQTdVdE9yb3QxVkw3c2dwRgpUVXRLMEs5bTRMazd2bnd4TGx6V0dIYWFneEthdEVsdlBWTjRZeWpXQ2s4cU4xNzlIeEUwV25hSm5OMjMxQm11ClVhM3kzTnNQS2tkbWhhc0RyYzlpRDBzMHRHVmhlaGdnV05MOVJ6Tm5wYjhlRkZHSjFCREpvM1NvWWFKcG41cEQKTVNYRDYzQnM3UmhhaFlpTm1Dc2pFUUdxWUVmL2VsVXl2T2JaaHdJREFRQUJBb0lCQUFhcmtqM3VZeE0rcFhxegpFL0R4VXR3ZWVja2pVU2t3YnVGaUdteXB3aDRWWGZVcFdTbjAvZTBSaE5JSTFtR2JSMWRaQy9ZWnF4MDRqOFZ0CnF6NStNU0dINTllME0xMXdiSDVuRUdCSC9oR0x0blU0N2pIamJybVJodlhUNGQxLzRwZlZHd2g5SkVERHZsUGQKd0lqbWd0Kyt0N3dmSDR6WXJCMG5kYTJ5YTd2Z3k3TWxVcUFYNTgvNTBVcHlkVnQ1c2ZzNkI3d2dDV2pSYmY3ZQpkTlVWTFdaUU9lZ042amZSYm4vVGNGcVB0N3F3TExIVC81dUprcWhJSHZZMHFOMFJBeG40TThneVE3UVIyaHFGCmUwU3lVOHJkREd4TFRmTmN0NmMwL0pRM3h0R1Fpd0YrdHdJZUYwMEFLaTB4dWUzME5iM2JWQTNsUzlZWjkrOE4Kblo1VjJHRUNnWUVBM3BCMjd2d3lObTY0emY3MUJ2UXo1WnJoNnVid2ltNDl6WUxoemFheXBQRTFWWFlsYlFvSQppRzZzaXRnUFZwYktYMFYrSkVkeVJ4bktjSVE5YXhwbFV0bzllaGloZUFVVFU0WnlERjBPeHBrY0QzSldROTlLCnlHQkRMalpwY2JpdjJhaEd1RFFjaEd0c2NNd2pVWGY1MVljWVNDVVJhWTBkOEpBQVVuaFIzS01DZ1lFQTVxWmoKTjU1T0sybkIxdHJBQUd4eTNuM2ZGNUJ2VmZoUWVueUIrSXFtSzlBc3lHbm9wbTFDN01wNFhwYVh5QjBhZHRxZgpJT0JKK1lTOEtIbDFxSXQyaGJzNTNLU3d5M0VpVzJtWkwzRUNvU3J3Y1BCRlhBSDdtUkNkdUdoT0J3OXNKM0twCmNZYUpVUHlPTGpyTnJtOENUcHNNRGZwWFk2ZTgxOVpyMEUyUjJjMENnWUJrNkxjajcvQ01RWE5FNHI0Um94TU0KblVhbERJUXZINENoOXgrTjhIQzYzQ3BFVDBiMHcwSFBLZTdOSE4wSGMyTGFBMVlIK09UVlc5b3ZYYVhETTdxUQo4Q1pEZjN0bVFWYmIzZTlEcjhXTlFjbzVMcXZ5SmdGd0RFVXBaTDQyTTNoM2hSWmJXalU3ek1Eais0cGYyN2ZJCm1uSGw4L2lMRk5Kb1NjSDdvbFhyWlFLQmdRRFlDbjNndU0wcmFOSUJ0OEFrSlhDcTZtZXVvTUZJVzJDMmVpMGIKYW5NZmtzeC9wSVFnYnpOQ3JKdDJyY1BaMHpqWW53cHlOdVBUYmZyNFJseG8xTWpkbG5NcU1yRE92bGVhSEIwNgpETGFUMDY2SGV1YmN1WmE2MW8rRkRWNFl5dDlaUzlOZTNNOStKakhmSjRGRXBBSWJNcXRsNUZrNnBRRURnbnBXCkVISk8rUUtCZ1FETUJsZVFpSEVJQlArTkRoazlwOEM2aUhMUVdNY0tBTXc4QzdJcW5SWDRORW9OSXNQTE5WWXYKSFBCdlRObkZDUW9LaUdMMWRzTUFMMGs2aEpHeDZ6ZGk0aGVCTkNRcnZORDZ2QWFlK3RUb0t6VzUybUowL2RoNwp0d3FLbnJXV0F5VWUvNnoxV3FqOThkT21aSWNxV3NaeTZzcC9Ub0VXQ1dQWm1MQjZzRXRsdWc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo="
---
apiVersion: apps/v1beta1
kind: Deployment
metadata:
name: package-server
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
labels:
app: package-server
spec:
Expand Down Expand Up @@ -139,7 +139,7 @@ apiVersion: v1
kind: Service
metadata:
name: package-server
namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
spec:
ports:
- port: 443
Expand Down
19 changes: 19 additions & 0 deletions deploy/ocp/manifests/0.7.1/image-references
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
##---
# Source: olm/templates/image-references

kind: ImageStream
apiVersion: image.openshift.io/v1
spec:
tags:
- name: olm
from:
kind: DockerImage
Name: quay.io/coreos/olm@sha256:058731fac9ecad9a35276612ec79bed76f506aaecd80c8c1fe9d68a262edcddb
- name: catalog
from:
kind: DockerImage
Name: quay.io/coreos/catalog@sha256:57eb45f2a519c65041d3fad0d7a5199f2ce5ba6a72992606ec4839d3307c5b5f
- name: package-server
from:
kind: DockerImage
Name: quay.io/coreos/package-server@sha256:cc18b5711fb2126329c969f077f67f41981c87f800f6b2ceae5981422c14917b
2 changes: 1 addition & 1 deletion deploy/ocp/manifests/latest
4 changes: 2 additions & 2 deletions deploy/ocp/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rbacApiVersion: rbac.authorization.k8s.io
namespace: operator-lifecycle-manager
catalog_namespace: operator-lifecycle-manager
namespace: openshift-operator-lifecycle-manager
catalog_namespace: openshift-operator-lifecycle-manager
imagestream: true
alm:
replicaCount: 1
Expand Down
2 changes: 1 addition & 1 deletion deploy/okd/manifests/0.7.1/30_00-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: operator-lifecycle-manager
name: openshift-operator-lifecycle-manager
Loading

0 comments on commit 6f3bf9b

Please sign in to comment.