Merge pull request #693 from ecordell/downstream-registry

chore(deploy): use downstream image for openshift builds

Author: openshift-merge-robot

Makefile

@@ -179,6 +179,7 @@ release:
 	rm -rf manifests
 	mkdir manifests
 	cp -R deploy/ocp/manifests/$(ver)/. manifests
+	find ./manifests -type f -exec sed -i '' '/^#/d' {} \;
 
 package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver))
 package:

deploy/chart/catalog_resources/rh-operators/metering-operator.v0.12.0.clusterserviceversion.yaml

@@ -0,0 +1,6 @@
+{{- if .Values.imagestream }}
+apiVersion: config.openshift.io/v1
+kind: ClusterOperator
+metadata:
+  name: {{ .Values.writeStatusName }}
+{{- end }}

deploy/chart/templates/0000_50_18-operatorstatus.yaml

@@ -6,5 +6,9 @@ spec:
   - name: operator-lifecycle-manager
     from:
       kind: DockerImage
-      name:  {{ .Values.olm.image.ref }}
+      name: {{ .Values.olm.image.ref }}
+  - name: operator-registry
+    from:
+      kind: DockerImage
+      name: quay.io/operatorframework/configmap-operator-registry:latest
 {{- end }}

deploy/chart/templates/image-references

@@ -18,6 +18,7 @@ olm:
 
 catalog:
   replicaCount: 1
+  commandArgs: -configmapServerImage=quay.io/operatorframework/configmap-operator-registry:latest
   image:
     ref: quay.io/coreos/olm:master
     pullPolicy: Always
@@ -35,7 +36,3 @@ package:
     internalPort: 5443
   nodeSelector:
     beta.kubernetes.io/os: linux
-
-catalog_sources:
- - rh-operators
- - certified-operators

deploy/chart/values.yaml

@@ -25,6 +25,8 @@ spec:
           command:
           - /bin/olm
           args:
+          - -writeStatusName
+          - operator-lifecycle-manager
           image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
           imagePullPolicy: IfNotPresent
           ports:

deploy/ocp/manifests/0.8.1/0000_50_10-olm-operator.deployment.yaml

@@ -27,6 +27,7 @@ spec:
           args:
           - '-namespace'
           - openshift-operator-lifecycle-manager
+          - -configmapServerImage=quay.io/operatorframework/configmap-operator-registry:latest
           image: quay.io/coreos/olm@sha256:995a181839f301585a0e115c083619b6d73812c58a8444d7b13b8e407010325f
           imagePullPolicy: IfNotPresent
           ports:

deploy/ocp/manifests/0.8.1/0000_50_11-catalog-operator.deployment.yaml

@@ -27,7 +27,7 @@ data:
           name: Red Hat
         links:
         - name: Package Server
-          url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/packageserver
+          url: https://github.com/operator-framework/operator-lifecycle-manager/tree/master/pkg/package-server
         installModes:
         - type: OwnNamespace
           supported: true