Merge pull request #762 from ecordell/upstream-catalog

Add upstream catalog
operator-framework · Mar 18, 2019 · 5159b0a · 5159b0a
2 parents ee4c86f + 22820fd
commit 5159b0a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/deploy/chart/templates/0000_50_olm_06-olm-operator.deployment.yaml b/deploy/chart/templates/0000_50_olm_06-olm-operator.deployment.yaml
@@ -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:

diff --git a/deploy/chart/templates/0000_50_olm_14-operatorstatus.yaml b/deploy/chart/templates/0000_50_olm_14-operatorstatus.yaml
@@ -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 }}
diff --git a/deploy/chart/templates/0000_50_olm_17-upstream-operators.catalogsource.yaml b/deploy/chart/templates/0000_50_olm_17-upstream-operators.catalogsource.yaml
@@ -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
+  displayName: Community Operators
+  publisher: OperatorHub.io
+{{ end }}