From 6a7991ded958922185be7b6f535e4e19d22e1a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 8 Feb 2019 15:30:58 +0100 Subject: [PATCH] remove minishift support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As per https://github.com/operator-framework/operator-lifecycle-manager/issues/705#issuecomment-462086956 it has been decided to drop support for minishift. Signed-off-by: Sébastien Han --- Documentation/install/install.md | 12 ------- Documentation/install/local-values-shift.yaml | 33 ------------------- Makefile | 13 +------- e2e-local-shift.Dockerfile | 9 ----- scripts/build_local_shift.sh | 21 ------------ 5 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 Documentation/install/local-values-shift.yaml delete mode 100644 e2e-local-shift.Dockerfile delete mode 100755 scripts/build_local_shift.sh diff --git a/Documentation/install/install.md b/Documentation/install/install.md index 5647298305..117249e766 100644 --- a/Documentation/install/install.md +++ b/Documentation/install/install.md @@ -29,18 +29,6 @@ make run-local You can verify that the OLM components have been successfully deployed by running `kubectl -n local get deployments` -## Run locally with minishift - -This command starts minishift, builds the OLM containers locally with the minishift-provided docker, and uses the local configuration in [local-values-shift.yaml](local-values-shift.yaml) to build localized deployment resources for OLM. - -Note that this step requires the `helm` binary, which doesn't come with minishift by default, to be present in your PATH. It can be downloaded from the [helm releases page](https://github.com/helm/helm/releases) - -``` -make run-local-shift -``` - -You can verify that the OLM components have been successfully deployed by running `kubectl -n local get deployments` - ## Building deployment resources for any cluster Deployments of OLM can be stamped out with different configurations by writing a `values.yaml` file and running commands to generate resources. diff --git a/Documentation/install/local-values-shift.yaml b/Documentation/install/local-values-shift.yaml deleted file mode 100644 index 4ddb667138..0000000000 --- a/Documentation/install/local-values-shift.yaml +++ /dev/null @@ -1,33 +0,0 @@ -rbacApiVersion: authorization.openshift.io -namespace: local -watchedNamespaces: local -catalog_namespace: local -operator_namespace: local -debug: true - -olm: - replicaCount: 1 - image: - ref: quay.io/coreos/olm:local - pullPolicy: IfNotPresent - service: - internalPort: 8080 - -catalog: - replicaCount: 1 - image: - ref: quay.io/coreos/catalog:local - pullPolicy: IfNotPresent - service: - internalPort: 8080 - -package: - replicaCount: 1 - image: - ref: quay.io/coreos/package-server:local - pullPolicy: IfNotPresent - service: - internalPort: 443 - -catalog_sources: - - rh-operators diff --git a/Makefile b/Makefile index 9be5c0d9bd..c033a2c8dc 100644 --- a/Makefile +++ b/Makefile @@ -61,13 +61,6 @@ deploy-local: . ./scripts/install_local.sh local build/resources rm -rf build -run-local-shift: - . ./scripts/build_local_shift.sh - mkdir -p build/resources - . ./scripts/package-release.sh 1.0.0 build/resources Documentation/install/local-values-shift.yaml - . ./scripts/install_local.sh local build/resources - rm -rf build - e2e.namespace: @printf "e2e-tests-$(shell date +%s)-$$RANDOM" > e2e.namespace @@ -87,10 +80,6 @@ e2e-local: e2e-bare: setup-bare . ./scripts/run_e2e_bare.sh $(TEST) -e2e-local-shift: - . ./scripts/build_local_shift.sh - . ./scripts/run_e2e_local.sh $(TEST) - e2e-local-docker: . ./scripts/build_local.sh . ./scripts/run_e2e_docker.sh $(TEST) @@ -163,7 +152,7 @@ verify-codegen: codegen verify-catalog: -generate-mock-client: +generate-mock-client: $(MOCKGEN) gen-all: gen-ci container-codegen container-mockgen diff --git a/e2e-local-shift.Dockerfile b/e2e-local-shift.Dockerfile deleted file mode 100644 index add67b7af8..0000000000 --- a/e2e-local-shift.Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# current openshift does not support multi-stage builds, have to build a fat image -FROM golang:1.11 -WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager -COPY . . -RUN make build && cp bin/olm /bin/olm && cp bin/catalog /bin/catalog && cp bin/package-server /bin/package-server - -COPY deploy/chart/catalog_resources /var/catalog_resources - -CMD ["/bin/olm"] diff --git a/scripts/build_local_shift.sh b/scripts/build_local_shift.sh deleted file mode 100755 index 74ac0e3723..0000000000 --- a/scripts/build_local_shift.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# Note: run from root -# This is used to start and build services for running e2e tests - -set -e -minishift start \ - || { echo 'Cannot start shift.'; exit 1; } - -eval $(minishift docker-env) \ - || { echo 'Cannot switch to minishift docker'; exit 1; } -eval $(minishift oc-env) \ - || { echo 'Cannot configure oc env'; exit 1; } - -oc login -u system:admin - -docker build \ - -t quay.io/coreos/catalog:local \ - -t quay.io/coreos/olm:local \ - -t quay.io/coreos/package-server:local \ - -f e2e-local-shift.Dockerfile .