Skip to content

Commit

Permalink
Merge pull request #704 from leseb/git-objects
Browse files Browse the repository at this point in the history
remove minishift support
  • Loading branch information
openshift-merge-robot authored Mar 10, 2019
2 parents 8633261 + 6a7991d commit a196e4e
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 87 deletions.
12 changes: 0 additions & 12 deletions Documentation/install/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
33 changes: 0 additions & 33 deletions Documentation/install/local-values-shift.yaml

This file was deleted.

13 changes: 1 addition & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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)
Expand Down Expand Up @@ -163,7 +152,7 @@ verify-codegen: codegen

verify-catalog:

generate-mock-client:
generate-mock-client:
$(MOCKGEN)

gen-all: gen-ci container-codegen container-mockgen
Expand Down
9 changes: 0 additions & 9 deletions e2e-local-shift.Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions scripts/build_local_shift.sh

This file was deleted.

0 comments on commit a196e4e

Please sign in to comment.