Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add upstream catalog #762

Merged
merged 2 commits into from
Mar 18, 2019
Merged

Add upstream catalog #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1688965
feat(upstream): add operatorhubio catalog to upstream release
ecordell Mar 18, 2019
22820fd
fix(chart): persist operatorstatus reporting changes to chart
ecordell Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deploy/chart/templates/0000_50_olm_06-olm-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ spec:
path: /healthz
port: {{ .Values.olm.service.internalPort }}
env:
{{ if (.Values.installType) and eq .Values.installType "ocp" }}
- name: RELEASE_VERSION
value: "0.0.1-snapshot"
{{ end }}
- name: OPERATOR_NAMESPACE
valueFrom:
fieldRef:
Expand Down
4 changes: 4 additions & 0 deletions deploy/chart/templates/0000_50_olm_14-operatorstatus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ apiVersion: config.openshift.io/v1
kind: ClusterOperator
metadata:
name: {{ .Values.writeStatusName }}
status:
versions:
- name: operator
version: "0.0.1-snapshot"
{{- end }}
14 changes: 14 additions & 0 deletions deploy/chart/templates/0000_50_olm_17-upstream-operators.catalogsource.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#! validate-crd: ./deploy/chart/templates/05-catalogsource.crd.yaml
#! parse-kind: CatalogSource
{{ if (.Values.installType) and eq .Values.installType "upstream" }}
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: operatorhubio-catalog
namespace: {{ .Values.catalog_namespace }}
spec:
sourceType: grpc
image: quay.io/operator-framework/upstream-community-operators:latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is good. I just wonder if we want to inject the version/digest as part of the template instead of hard-coding latest.

displayName: Community Operators
publisher: OperatorHub.io
{{ end }}