Skip to content

Commit 04a24ad

Browse files
committed
feat(install): Add new install scripts for releases, update release
instructions. Also removes okd manifests, which are no longer relevant.
1 parent 41821c7 commit 04a24ad

File tree

124 files changed

+502
-70397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+502
-70397
lines changed

Documentation/design/release.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,12 @@ github_changelog_generator -u operator-framework -p operator-lifecycle-manager -
1919
--token=<github-api-token> --future-release=<end-semver> --pr-label="**Other changes:**"
2020
```
2121

22-
The resulting CHANGELOG.md file can be copied into a new release created via <https://github.com/operator-framework/operator-lifecycle-manager/releases/new>.
22+
The resulting CHANGELOG.md file can be copied into a new release created via <https://github.com/operator-framework/operator-lifecycle-manager/releases/new>.
23+
24+
## QuickStart
25+
26+
Edit the GitHub Release and upload the files in `deploy/upstream/quickstart` as release artifacts.
27+
28+
Then, add instructions to the GitHub release page to install referencing those manifests.
29+
30+
See an [example here](https://github.com/operator-framework/operator-lifecycle-manager/releases/tag/0.10.0#Install).

Documentation/install/install.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,19 @@
22

33
OLM deployment resources are templated so that they can be easily configured for different deployment environments.
44

5-
## Install the latest released version of OLM for upstream Kubernetes
5+
Check out the latest [releases on github](https://github.com/operator-framework/operator-lifecycle-manager/releases) for release-specific install instructions.
66

7-
```bash
8-
kubectl create -f deploy/upstream/manifests/latest/
9-
```
10-
11-
## Install the latest release version of OLM for okd
7+
## Manual installation
128

9+
Installing the CRDs first gives them a chance to register before installing the rest, which requires the CRDs exist.
1310
```bash
14-
oc create -f deploy/okd/manifests/latest/
11+
kubectl create -f deploy/upstream/quickstart/crds.yaml
12+
kubectl create -f deploy/upstream/quickstart/olm.yaml
1513
```
1614

17-
## Install with Ansible for openshift
15+
## OpenShift
1816

19-
OLM should be installed via [openshift-ansible](https://github.com/openshift/openshift-ansible). The manifests in this
20-
repo is periodically synced with openshift-ansible and should only be used for testing releases.
17+
OLM is installed by default in OpenShift 4.0 and above.
2118

2219
## Run locally with minikube
2320

@@ -29,7 +26,7 @@ make run-local
2926

3027
You can verify that the OLM components have been successfully deployed by running `kubectl -n local get deployments`
3128

32-
## Building deployment resources for any cluster
29+
## Customizing OLM installation
3330

3431
Deployments of OLM can be stamped out with different configurations by writing a `values.yaml` file and running commands to generate resources.
3532

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ release: ver=$(shell cat OLM_VERSION)
185185
release:
186186
docker pull quay.io/operator-framework/olm:$(ver)
187187
$(MAKE) target=upstream ver=$(ver) quickstart=true package
188-
$(MAKE) target=okd ver=$(ver) package
189188
$(MAKE) target=ocp ver=$(ver) package
190189
rm -rf manifests
191190
mkdir manifests
@@ -208,7 +207,7 @@ endif
208207
./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
209208
ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
210209
ifeq ($(quickstart), true)
211-
./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml
210+
./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
212211
endif
213212

214213
##########################
@@ -218,4 +217,4 @@ endif
218217
.PHONY: run-console-local
219218
run-console-local:
220219
@echo Running script to run the OLM console locally:
221-
. ./scripts/run_console_local.sh
220+
. ./scripts/run_console_local.sh

deploy/alm-ci-build.Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ spec:
9393
type: string
9494
type: array
9595
required:
96-
- namespaces
9796
- lastUpdated
9897
type: object
9998
required:

deploy/ocp/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ package:
7373
- key: node.kubernetes.io/not-ready
7474
operator: Exists
7575
effect: NoExecute
76-
tolerationSeconds: 120
76+
tolerationSeconds: 120

deploy/okd/manifests/0.10.0/0000_50_olm_00-namespace.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

deploy/okd/manifests/0.10.0/0000_50_olm_01-olm-operator.serviceaccount.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

deploy/okd/manifests/0.10.0/0000_50_olm_04-installplan.crd.yaml

Lines changed: 0 additions & 80 deletions
This file was deleted.

deploy/okd/manifests/0.10.0/0000_50_olm_05-subscription.crd.yaml

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)