Merge pull request #381 from ecordell/0.5.0

Cut 0.5.0

Dockerfile.rhel7

@@ -10,3 +10,7 @@ WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
 COPY . .
 
 RUN make build
+
+RUN cp ./bin/alm /bin/alm
+RUN cp ./bin/catalog /bin/catalog
+EXPOSE 8080

Makefile

@@ -191,5 +191,36 @@ ansible-release: $(YQ)
 	# link newest release into playbook
 	ln -sfF ../../../../deploy/aos-olm/$(ver) deploy/aos-olm/playbook/private/roles/olm
 
-# make ver=0.3.0 release
-release: tectonic-release upstream-release ansible-release
+OLM_REF:=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver))
+CATALOG_REF:=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/catalog:$(ver))
+
+# must have already tagged a version release in github so that the docker images are available
+release:
+ifndef ver
+	$(error ver is undefined)
+endif
+	docker pull quay.io/coreos/olm:$(ver)
+	docker pull quay.io/coreos/catalog:$(ver)
+	yaml w -i deploy/upstream/values.yaml alm.image.ref $(OLM_REF)
+	yaml w -i deploy/upstream/values.yaml catalog.image.ref $(CATALOG_REF)
+	yaml w -i deploy/tectonic-alm-operator/values.yaml alm.image.ref $(OLM_REF)
+	yaml w -i deploy/tectonic-alm-operator/values.yaml catalog.image.ref $(CATALOG_REF)
+	$(MAKE) tectonic-release upstream-release
+
+# These are built from the same image, and repodigests are ordered alphabetically, so olm is ref 1 and catalog ref 2
+OLM_REF_RH:=$(shell docker inspect --format='{{index .RepoDigests 1}}' quay.io/coreos/olm:$(ver)-rhel)
+CATALOG_REF_RH:=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/catalog:$(ver)-rhel)
+
+# this will build locally on rhel
+release-rh:
+ifndef ver
+	$(error ver is undefined)
+endif
+	./scripts/pull_or_build_rh.sh $(ver)
+	echo $(OLM_REF_RH)
+	docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver)-rhel
+	yaml w -i deploy/aos-olm/values.yaml alm.image.ref $(OLM_REF_RH)
+	yaml w -i deploy/aos-olm/values.yaml catalog.image.ref $(CATALOG_REF_RH)
+	$(MAKE) ansible-release
+
+release-all: release release-rh

deploy/aos-olm/0.5.0/defaults/main.yaml

@@ -0,0 +1,3 @@
+---
+operator_lifecycle_manager_remove: false
+operator_lifecycle_manager_install: true

deploy/aos-olm/0.5.0/files/01-alm-operator.serviceaccount.yaml

@@ -0,0 +1,11 @@
+##---
+# Source: olm/templates/01-alm-operator.serviceaccount.yaml
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: alm-operator-serviceaccount
+  namespace: operator-lifecycle-manager
+  labels:
+    tectonic-operators.coreos.com/managed-by: tectonic-x-operator
+imagePullSecrets:
+- name: coreos-pull-secret

deploy/aos-olm/0.5.0/files/02-alm-operator.rolebinding.yaml

@@ -0,0 +1,16 @@
+##---
+# Source: olm/templates/02-alm-operator.rolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: alm-operator-binding
+  labels:
+    tectonic-operators.coreos.com/managed-by: tectonic-x-operator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: alm-operator-serviceaccount
+  namespace: operator-lifecycle-manager