Skip to content

Commit 1e496d9

Browse files
author
Per Goncalves da Silva
committed
remove minikube
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 157af32 commit 1e496d9

File tree

8 files changed

+3
-44
lines changed

8 files changed

+3
-44
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ __pycache__/
449449
/build
450450
/apiserver.local.config
451451
e2e.namespace
452-
minikube.kubeconfig
453452
apiserver.crt
454453
apiserver.key
455454

DEVELOPMENT.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515

1616
| Requirement | install docs |
1717
|-------------|----------------------|
18-
| Minikube | [Minikube docs] |
1918
| Kind | [Kind docs] |
2019

21-
[Minikube docs]: https://minikube.sigs.k8s.io/docs/start
2220
[Kind docs]: https://kind.sigs.k8s.io/docs/user/quick-start
2321

2422
### Usage
@@ -40,7 +38,7 @@ To run the e2e tests locally:
4038
$ make e2e-local
4139
```
4240

43-
**NOTE:** Command `make e2e-local` supports Minikube and Kind environments. If you want to run the e2e tests on Minikube, you need to make sure Minikube is deployed in the local environment. If you want to run the e2e tests on Kind, you need to make sure Kind is deployed in the local environment and switch the kubeconfig to an existing Kind cluster.
41+
**NOTE:** If you want to run the e2e tests, you need to make sure Kind is deployed in the local environment and switch the kubeconfig to an existing Kind cluster.
4442

4543
To run a specific e2e test locally:
4644

doc/install/install.md

-13
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,6 @@ kubectl create -f deploy/upstream/quickstart/olm.yaml
1616

1717
Check out the latest [releases on github](https://github.com/operator-framework/operator-lifecycle-manager/releases) for release-specific install instructions.
1818

19-
## Run locally with minikube
20-
21-
This command starts minikube, builds the OLM containers locally with the minikube-provided docker, and uses the local configuration in [local-values.yaml](local-values.yaml) to build localized deployment resources for OLM.
22-
23-
```bash
24-
# To install and run locally
25-
$ make run-local
26-
```
27-
28-
You can verify that the OLM components have been successfully deployed by running `kubectl -n olm get deployments`
29-
30-
**NOTE** It is recommended for development purposes and will use the source locally
31-
3219
## OpenShift
3320

3421
**IMPORTANT:** OLM is installed by default in OpenShift 4.0 and above.

scripts/build_bare.sh

-7
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,5 @@
55

66
set -e
77

8-
if [ -z "$NO_MINIKUBE" ]; then
9-
ps x | grep -q [m]inikube || minikube start --kubernetes-version="v1.11.0" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
10-
eval $(minikube docker-env) || { echo 'Cannot switch to minikube docker'; exit 1; }
11-
kubectl config use-context minikube
12-
umask 0077 && kubectl config view --minify --flatten --context=minikube > minikube.kubeconfig
13-
fi
14-
158
kubectl delete crds --all
169
kubectl create namespace $(cat $(pwd)/e2e.namespace)

scripts/build_local.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
set -e
77
set -o xtrace
88

9-
[ -x "$(command -v kind)" ] && [[ "$(kubectl config current-context)" =~ ^kind-? ]] && KIND=1 NO_MINIKUBE=1
10-
11-
if [ -z "$NO_MINIKUBE" ]; then
12-
pgrep -f "[m]inikube" >/dev/null || minikube start "${MINIKUBE_ARGS}" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
13-
eval "$(minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; }
14-
kubectl config use-context minikube
15-
fi
9+
[ -x "$(command -v kind)" ] && [[ "$(kubectl config current-context)" =~ ^kind-? ]] && KIND=1
1610

1711
docker build -f e2e.Dockerfile -t quay.io/operator-framework/olm:local -t quay.io/operator-framework/olm-e2e:local ./bin
1812
docker build -f test/e2e/hang.Dockerfile -t hang:10 ./bin

scripts/run_e2e_bare.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ fi
1414

1515
echo "${test_flags}"
1616
go test -c -tags=bare -mod=vendor -v -o e2e-bare github.com/operator-framework/operator-lifecycle-manager/test/e2e
17-
./e2e-bare -test.v -test.timeout 20m ${test_flags} -kubeconfig=${KUBECONFIG:-minikube.kubeconfig} -namespace=$(cat e2e.namespace) -olmNamespace=operator-lifecycle-manager -dummyImage=hang:10
17+
./e2e-bare -test.v -test.timeout 20m ${test_flags} -kubeconfig=${KUBECONFIG:} -namespace=$(cat e2e.namespace) -olmNamespace=operator-lifecycle-manager -dummyImage=hang:10

scripts/run_e2e_docker.sh

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ trap cleanupAndExit SIGINT SIGTERM EXIT
4848
mkdir -p test/e2e/test-resources
4949
helm template --set namespace="${namespace}" -f test/e2e/e2e-values.yaml test/e2e/chart --output-dir test/e2e/test-resources
5050

51-
eval "$(minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; }
5251
kubectl apply -f test/e2e/test-resources/olm-e2e/templates
5352
until kubectl -n "${namespace}" logs job/e2e | grep -v "ContainerCreating"; do echo "waiting for job to run" && sleep 1; done
5453
kubectl -n "${namespace}" logs job/e2e -f

test/e2e/README.md

-11
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ This runs a series of tests against the Kubernetes API to verify that OLM is fun
44

55
## Requirements
66

7-
* Minikube > 0.25.0
87
* Helm > 2.7.0
98

109
## How to use
@@ -55,13 +54,3 @@ make file and use `-dryRun` with `-focus` and see if the regex would trigger you
5554
## Build infrastructure
5655

5756
Note that the make file target `e2e-local` is executed by the github workflow `.github/workflows/e2e-tests.yml` and uses two parallel `go test` processes.
58-
59-
## Running on minikube
60-
61-
The e2e suite is also runnable on a minikube cluster. First spin up the minikube cluster manually with the desired provisioner,
62-
then run `make run-local` to deploy OLM onto the cluster. Tests can be run by invoking ginkgo and passing the required command line
63-
arguments to the test suite. For example to run a specific test:
64-
65-
```bash
66-
GO111MODULE=on go run github.com/onsi/ginkgo/v2/ginkgo -focus "static provider" -v --progress ./test/e2e -- -namespace=operators -olmNamespace=olm -dummyImage=bitnami/nginx:latest
67-
```

0 commit comments

Comments
 (0)