From e07bc9b3785358c23577b160cb316ea5365c4faa Mon Sep 17 00:00:00 2001 From: Daniel Pacak Date: Tue, 27 Apr 2021 13:48:03 +0200 Subject: [PATCH] chore: Upgrade OLM from v0.16.1 to 0.17.0 (#526) Resolves: #525 Signed-off-by: Daniel Pacak --- CONTRIBUTING.md | 19 ++++++++++--------- docs/operator/installation/olm.md | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7dec235a9..6d0a6f2f0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -264,16 +264,16 @@ $ kubectl delete -f deploy/crd/vulnerabilityreports.crd.yaml \ To install [Operator Lifecycle Manager][olm] (OLM) run: ``` -$ kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.16.1/crds.yaml -$ kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.16.1/olm.yaml +$ kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/crds.yaml +$ kubectl apply -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/olm.yaml ``` or ``` -$ curl -L https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.16.1/install.sh -o install.sh +$ curl -L https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/install.sh -o install.sh $ chmod +x install.sh -$ ./install.sh 0.16.1 +$ ./install.sh v0.17.0 ``` ### Build the Catalog Image @@ -311,8 +311,8 @@ Place the `starboard-catalog.Dockerfile` in the top-level directory of your clon it to your Kubernetes cluster: ``` -$ docker build -f starboard-catalog.Dockerfile -t starboard-catalog:dev . -$ kind load docker-image starboard-catalog:dev +$ docker build -f starboard-catalog.Dockerfile -t docker.io//starboard-catalog:dev . +$ docker push docker.io//starboard-catalog:dev ``` ### Register the Catalog Image @@ -331,7 +331,7 @@ spec: publisher: Starboard Maintainers displayName: Starboard Catalog sourceType: grpc - image: starboard-catalog:dev + image: docker.io//starboard-catalog:dev EOF ``` @@ -350,8 +350,8 @@ starboard-operator Starboard Catalog 97s ``` If the Starboard Operator appears in this list, the catalog was successfully parsed and it is now available to install. -Follow the installation instructions for [OLM](https://aquasecurity.github.io/starboard/operator/installation/olm/). -Make sure that the Subscription's `spec.source` property refers to the `starboard-catalog` source instead of `operatorhubio-catalog`. +Follow the installation instructions for [OLM][starboard-install-olm]. Make sure that the Subscription's `spec.source` +property refers to the `starboard-catalog` source instead of `operatorhubio-catalog`. You can find more details about testing Operators with Operator Framework [here][olm-testing-operators]. @@ -364,4 +364,5 @@ You can find more details about testing Operators with Operator Framework [here] [community-operators]: https://github.com/operator-framework/community-operators [olm-operator-groups]: https://github.com/operator-framework/operator-lifecycle-manager/blob/master/doc/design/operatorgroups.md [k8s-sample-controller]: https://github.com/kubernetes/sample-controller +[starboard-install-olm]: https://aquasecurity.github.io/starboard/latest/operator/installation/olm [olm-testing-operators]: https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md diff --git a/docs/operator/installation/olm.md b/docs/operator/installation/olm.md index c6255f0eb..2f6527aef 100644 --- a/docs/operator/installation/olm.md +++ b/docs/operator/installation/olm.md @@ -10,7 +10,7 @@ configure it to watch the `default` namespaces: 1. Install the Operator Lifecycle Manager: ``` - curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/0.16.1/install.sh | bash -s 0.16.1 + curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/install.sh | bash -s v0.17.0 ``` 2. Create the namespace to install the operator in: ``` @@ -74,7 +74,7 @@ configure it to watch the `default` namespaces: 6. After install, watch the operator come up using the following command: ```console $ kubectl get clusterserviceversions -n starboard-operator - NAME DISPLAY VERSION REPLACES PHASE + NAME DISPLAY VERSION REPLACES PHASE starboard-operator.{{ var.tag }} Starboard Operator {{ var.build.version }} starboard-operator.{{ var.tag_prev }} Succeeded ``` If the above command succeeds and the ClusterServiceVersion has transitioned from `Installing` to `Succeeded` phase