Merge pull request #875 from ecordell/installer

feat(install): Add new install scripts for releases, update release

Author: openshift-merge-robot

Documentation/design/release.md

@@ -19,4 +19,12 @@ github_changelog_generator -u operator-framework -p operator-lifecycle-manager -
     --token=<github-api-token> --future-release=<end-semver> --pr-label="**Other changes:**"
 ```
 
-The resulting CHANGELOG.md file can be copied into a new release created via <https://github.com/operator-framework/operator-lifecycle-manager/releases/new>.
+The resulting CHANGELOG.md file can be copied into a new release created via <https://github.com/operator-framework/operator-lifecycle-manager/releases/new>.
+
+## QuickStart
+
+Edit the GitHub Release and upload the files in `deploy/upstream/quickstart` as release artifacts.
+
+Then, add instructions to the GitHub release page to install referencing those manifests.
+
+See an [example here](https://github.com/operator-framework/operator-lifecycle-manager/releases/tag/0.10.0#Install).

Documentation/install/install.md

@@ -2,22 +2,19 @@
 
 OLM deployment resources are templated so that they can be easily configured for different deployment environments.
 
-## Install the latest released version of OLM for upstream Kubernetes
+Check out the latest [releases on github](https://github.com/operator-framework/operator-lifecycle-manager/releases) for release-specific install instructions.
 
-```bash
-kubectl create -f deploy/upstream/manifests/latest/
-```
-
-## Install the latest release version of OLM for okd
+## Manual installation 
 
+Installing the CRDs first gives them a chance to register before installing the rest, which requires the CRDs exist.
 ```bash
-oc create -f deploy/okd/manifests/latest/
+kubectl create -f deploy/upstream/quickstart/crds.yaml
+kubectl create -f deploy/upstream/quickstart/olm.yaml
 ```
 
-## Install with Ansible for openshift
+## OpenShift
 
-OLM should be installed via [openshift-ansible](https://github.com/openshift/openshift-ansible). The manifests in this
-repo is periodically synced with openshift-ansible and should only be used for testing releases.
+OLM is installed by default in OpenShift 4.0 and above.
 
 ## Run locally with minikube
 
@@ -29,7 +26,7 @@ make run-local
 
 You can verify that the OLM components have been successfully deployed by running `kubectl -n local get deployments`
 
-## Building deployment resources for any cluster
+## Customizing OLM installation 
 
 Deployments of OLM can be stamped out with different configurations by writing a `values.yaml` file and running commands to generate resources.
 

Makefile

@@ -183,7 +183,6 @@ release: ver=$(shell cat OLM_VERSION)
 release:
 	docker pull quay.io/operator-framework/olm:$(ver)
 	$(MAKE) target=upstream ver=$(ver) quickstart=true package
-	$(MAKE) target=okd ver=$(ver) package
 	$(MAKE) target=ocp ver=$(ver) package
 	rm -rf manifests
 	mkdir manifests
@@ -206,7 +205,7 @@ endif
 	./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
 	ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
 ifeq ($(quickstart), true)
-	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml
+	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
 endif
 
 ##########################
@@ -216,4 +215,4 @@ endif
 .PHONY: run-console-local
 run-console-local:
 	@echo Running script to run the OLM console locally:
-	. ./scripts/run_console_local.sh
+	. ./scripts/run_console_local.sh

deploy/alm-ci-build.Dockerfile

@@ -93,7 +93,6 @@ spec:
                 type: string
               type: array
           required:
-          - namespaces
           - lastUpdated
           type: object
       required:

deploy/ocp/manifests/0.10.0/0000_50_olm_10-operatorgroup.crd.yaml

@@ -73,4 +73,4 @@ package:
   - key: node.kubernetes.io/not-ready
     operator: Exists
     effect: NoExecute
-    tolerationSeconds: 120
+    tolerationSeconds: 120