Skip to content

Commit

Permalink
cut 0.5.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
ecordell committed Jul 16, 2018
1 parent 515b9ea commit 59755cc
Show file tree
Hide file tree
Showing 50 changed files with 9,724 additions and 24 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,18 @@ endif
yaml w -i deploy/tectonic-alm-operator/values.yaml catalog.image.ref $(CATALOG_REF)
$(MAKE) tectonic-release upstream-release

OLM_REF_RH:=$(shell docker inspect --format='{{index .RepoDigests 0}}' quay.io/coreos/olm:$(ver)-rhel)
# 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
docker build -f Dockerfile.rhel7 -t quay.io/coreos/olm:$(ver)-rhel -t quay.io/coreos/catalog:$(ver)-rhel .
docker push quay.io/coreos/olm:$(ver)-rhel
docker push quay.io/coreos/catalog:$(ver)-rhel
./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
Expand Down
3 changes: 3 additions & 0 deletions deploy/aos-olm/0.5.0/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
operator_lifecycle_manager_remove: false
operator_lifecycle_manager_install: true
Empty file.
11 changes: 11 additions & 0 deletions deploy/aos-olm/0.5.0/files/01-alm-operator.serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -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
16 changes: 16 additions & 0 deletions deploy/aos-olm/0.5.0/files/02-alm-operator.rolebinding.yaml
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 59755cc

Please sign in to comment.