Merge pull request #356 from ecordell/ansible

Ansible playbook

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "deploy/aos-olm/openshift-ansible"]
+	path = deploy/aos-olm/openshift-ansible
+	url = https://github.com/openshift/openshift-ansible

Dockerfile.rhel7

@@ -0,0 +1,12 @@
+FROM registry.centos.org/centos/centos:7
+
+RUN yum update -y
+RUN yum install -y golang make
+
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
+COPY . .
+
+RUN make build

Documentation/install/install.md

@@ -19,6 +19,17 @@ kubectl create namespace tectonic-system
 kubectl apply -f deploy/tectonic-alm-operator/manifests/0.4.0
 ```
 
+## Install with Ansible for openshift
+
+OLM should be installed via [openshift-ansible](https://github.com/openshift/openshift-ansible). The playbook in this
+repo is periodically synced with openshift-ansible and should only be used for testing releases.
+
+The playbook assumes that the hosts file has the same format as [openshift-ansible](https://github.com/openshift/openshift-ansible)
+
+```sh
+ansible-playbook -i path/to/hosts deploy/aos-olm/playbook/config.yaml
+```
+
 ## Run locally with minikube
 
 This command starts minikube, builds the OLM containers locally with the minikube-provided docker, and uses the local configuration in [local-values.yaml](local-values.yaml) to build localized deployment resources for OLM.

Makefile

@@ -152,13 +152,35 @@ $(counterfeiter):
 generate-mock-client: $(counterfeiter)
 	go generate ./$(PKG_DIR)/...
 
-make gen-all: gen-ci codegen generate-mock-client
+gen-all: gen-ci codegen generate-mock-client
 
 # make ver=0.3.0 tectonic-release
 tectonic-release:
 	./scripts/package-release.sh $(ver) deploy/tectonic-alm-operator/manifests/$(ver) deploy/tectonic-alm-operator/values.yaml
 
-# make ver=0.3.0 release
-release:
+# make ver=0.3.0 upstream-release
+upstream-release:
 	./scripts/package-release.sh $(ver) deploy/upstream/manifests/$(ver) deploy/upstream/values.yaml
 
+
+YQ := $(GOPATH)/bin/yq
+$(YQ):
+	go get -u github.com/mikefarah/yq
+
+# make ver=0.3.0 ansible-release
+ansible-release: $(YQ)
+	# ansible release uses openshift-ansible submodule
+	git submodule init
+	git submodule update
+	# copy base role to versioned release
+	mkdir -p deploy/aos-olm/$(ver)
+	cp -R deploy/role/. deploy/aos-olm/$(ver)/
+	# copy manifest files into release
+	./scripts/package-release.sh $(ver) deploy/aos-olm/$(ver)/files deploy/aos-olm/values.yaml
+	# generate install/remove tasks based on manifest files
+	./scripts/k8s_yaml_to_ansible_install.sh deploy/aos-olm/$(ver)/files deploy/aos-olm/$(ver)/tasks/install.yaml
+	./scripts/k8s_yaml_to_ansible_remove.sh deploy/aos-olm/$(ver)/files deploy/aos-olm/$(ver)/tasks/remove_components.yaml
+	# link newest release into playbook
+	ln -sfF ../../../../deploy/aos-olm/$(ver) deploy/aos-olm/playbook/private/roles/olm
+
+release: tectonic-release upstream-release ansible-release

deploy/aos-olm/playbook/config.yaml

@@ -0,0 +1,4 @@
+---
+- import_playbook: private/config.yaml
+  vars:
+    operator_lifecycle_manager_install: true

deploy/aos-olm/playbook/private/config.yaml

@@ -0,0 +1,6 @@
+---
+- name: Operator Lifecycle Manager
+  hosts: masters[0]
+  tasks:
+  - import_role:
+      name: olm

deploy/aos-olm/playbook/private/roles/lib_openshift

@@ -0,0 +1 @@
+../../../openshift-ansible/roles/lib_openshift

deploy/aos-olm/playbook/private/roles/lib_utils

@@ -0,0 +1 @@
+../../../openshift-ansible/roles/lib_utils

deploy/aos-olm/playbook/private/roles/olm

@@ -0,0 +1 @@
+../../../../deploy/aos-olm/0.4.1

deploy/aos-olm/values.yaml

@@ -0,0 +1,22 @@
+rbacApiVersion: rbac.authorization.k8s.io
+namespace: operator-lifecycle-manager
+catalog_namespace: operator-lifecycle-manager
+alm:
+  replicaCount: 1
+  image:
+    ref: quay.io/coreos/olm@sha256:351f0c4973a88a4ea606721555829776429b0ecb53d5a2bfee6bce459d109e5b
+    pullPolicy: IfNotPresent
+  service:
+    internalPort: 8080
+
+catalog:
+  replicaCount: 1
+  image:
+    ref: quay.io/coreos/catalog@sha256:54571e25474a9a063a144922e7321203e5aa5e63d03f748682d559341359a916
+    pullPolicy: IfNotPresent
+  service:
+    internalPort: 8080
+
+catalog_sources:
+ - tectonic-ocs
+ - upstream-components

deploy/role/defaults/main.yaml

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

deploy/role/meta/main.yaml

@@ -0,0 +1,16 @@
+---
+galaxy_info:
+  author: Evan Cordell
+  description: Operator Lifecycle Manager
+  company: Red Hat, Inc.
+  license: Apache License, Version 2.0
+  min_ansible_version: 2.1
+  platforms:
+  - name: EL
+    versions:
+    - 7
+  categories:
+  - cloud
+dependencies:
+- role: lib_utils
+- role: lib_openshift

deploy/role/tasks/install.yaml

@@ -0,0 +1,19 @@
+---
+
+- name: create operator-lifecycle-manager project
+  oc_project:
+    name: operator-lifecycle-manager
+    state: present
+    node_selector:
+      - ""
+
+- name: Make temp directory for manifests
+  command: mktemp -d /tmp/olm-ansible-XXXXXX
+  register: mktemp
+  changed_when: False
+
+- name: Copy manifests to temp directory
+  copy:
+    src: "{{ item }}"
+    dest: "{{ mktemp.stdout }}"
+  with_fileglob: files/*.yaml

deploy/role/tasks/main.yaml

@@ -0,0 +1,8 @@
+---
+# do any asserts here
+
+- include_tasks: install.yaml
+  when: operator_lifecycle_manager_install | bool
+
+- include_tasks: remove.yaml
+  when: operator_lifecycle_manager_remove | bool

deploy/role/tasks/remove.yaml

@@ -0,0 +1,8 @@
+---
+
+- import_tasks: remove_components.yaml
+
+- name: remove openshift-ansible-service-broker project
+  oc_project:
+    name: openshift-ansible-service-broker
+    state: absent

deploy/role/tasks/remove_components.yaml

@@ -0,0 +1 @@
+---

scripts/k8s_yaml_to_ansible_install.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# requires yq to be installed https://github.com/mikefarah/yq
+
+if [[ ${#@} < 2 ]]; then
+    echo "Usage: $0 manifests outfile"
+    echo "* manifests: directory of k8s manifests"
+    echo "* outfile: the ansible file to append"
+    exit 1
+fi
+
+manifests=$1
+outfile=$2
+
+for filename in $manifests/*.yaml; do
+  kind=$(yq r "$filename" kind)
+  name=$(yq r "$filename" metadata.name)
+  cat <<EOF >> $outfile
+
+- name: Apply $name $kind manifest
+  oc_obj:
+    state: present
+    kind: $kind
+    name: $name
+    namespace: operator-lifecycle-manager
+    files:
+      - "{{ mktemp.stdout }}/$(basename $filename)"
+EOF
+done

scripts/k8s_yaml_to_ansible_remove.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# requires yq to be installed https://github.com/mikefarah/yq
+
+if [[ ${#@} < 2 ]]; then
+    echo "Usage: $0 manifests outfile"
+    echo "* manifests: directory of k8s manifests"
+    echo "* outfile: the ansible file to append"
+    exit 1
+fi
+
+manifests=$1
+outfile=$2
+
+for filename in $manifests/*.yaml; do
+  kind=$(yq r "$filename" kind)
+  name=$(yq r "$filename" metadata.name)
+  cat <<EOF >> $outfile
+
+- name: Remove $name $kind manifest
+  oc_obj:
+    state: absent
+    kind: $kind
+    name: $name
+    namespace: operator-lifecycle-manager
+EOF
+done

scripts/package-release.sh

@@ -3,7 +3,7 @@
 # requires helm to be installed
 
 if [[ ${#@} < 3 ]]; then
-    echo "Usage: $0 version alm-sha catalog-sha"
+    echo "Usage: $0 semver chart values"
     echo "* semver: semver-formatted version for this package"
     echo "* chart: the directory to output the chart"
     echo "* values: the values file"