diff --git a/README.md b/README.md index 4172e516cd99bfc0eed5a3889b34ae5c54c60df0..50d42d5280cf558fb4ea834df83d837cf7b39971 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ This adapter is an Extension API Server and Kubernetes needs to be have this fea To try out this stack, start [minikube](https://github.com/kubernetes/minikube) with the following command: ```shell -$ minikube delete && minikube start --kubernetes-version=v1.17.3 --memory=6g --bootstrapper=kubeadm --extra-config=kubelet.authentication-token-webhook=true --extra-config=kubelet.authorization-mode=Webhook --extra-config=scheduler.address=0.0.0.0 --extra-config=controller-manager.address=0.0.0.0 +$ minikube delete && minikube start --kubernetes-version=v1.18.1 --memory=6g --bootstrapper=kubeadm --extra-config=kubelet.authentication-token-webhook=true --extra-config=kubelet.authorization-mode=Webhook --extra-config=scheduler.address=0.0.0.0 --extra-config=controller-manager.address=0.0.0.0 ``` The kube-prometheus stack includes a resource metrics API server, so the metrics-server addon is not necessary. Ensure the metrics-server addon is disabled on minikube: @@ -89,15 +89,18 @@ $ minikube addons disable metrics-server ### Kubernetes compatibility matrix -| kube-prometheus stack | Kubernetes 1.14 | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | -|-----------------------|-----------------|-----------------|-----------------|-----------------| -| `release-0.3` | ✔ | ✔ | ✔ | ✔ | -| `release-0.4` | ✗ | ✗ | ✔ | ✔ | -| `HEAD` | ✗ | ✗ | ✗ | ✔ | +The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work! + +| kube-prometheus stack | Kubernetes 1.14 | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | Kubernetes 1.18 | +|-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------| +| `release-0.3` | ✔ | ✔ | ✔ | ✔ | ✗ +| `release-0.4` | ✗ | ✗ | ✔ | ✔ | ✗ +| `release-0.5` | ✗ | ✗ | ✗ | ✔ | ✔ +| `HEAD` | ✗ | ✗ | ✗ | ✗ | ✔ ## Quickstart ->Note: For versions before Kubernetes v1.17.0 refer to the [Kubernetes compatibility matrix](#kubernetes-compatibility-matrix) in order to choose a compatible branch. +>Note: For versions before Kubernetes v1.18.z refer to the [Kubernetes compatibility matrix](#kubernetes-compatibility-matrix) in order to choose a compatible branch. This project is intended to be used as a library (i.e. the intent is not for you to create your own modified copy of this repository). diff --git a/scripts/minikube-start.sh b/scripts/minikube-start.sh index eb29e860cf2a8419ea04e91b92707b12e5ed7e9d..6a769b7118640a58d14ee0f8604db5dc548f6a37 100755 --- a/scripts/minikube-start.sh +++ b/scripts/minikube-start.sh @@ -2,7 +2,7 @@ minikube delete minikube addons disable metrics-server minikube start \ - --kubernetes-version=v1.16.0 \ + --kubernetes-version=v1.18.1 \ --memory=6g \ --bootstrapper=kubeadm \ --extra-config=kubelet.authentication-token-webhook=true \ diff --git a/tests/e2e/travis-e2e.sh b/tests/e2e/travis-e2e.sh index c95f763c596b33f9799489974794eaef810e1da3..21db2808c19b60ca5ef1122a10eed2752a493bf9 100755 --- a/tests/e2e/travis-e2e.sh +++ b/tests/e2e/travis-e2e.sh @@ -10,11 +10,12 @@ set -x curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl chmod +x kubectl -curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.6.1/kind-linux-amd64 +curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-linux-amd64 chmod +x kind -./kind create cluster --image=kindest/node:v1.17.0 -export KUBECONFIG="$(./kind get kubeconfig-path)" +./kind create cluster --image=kindest/node:v1.18.0 +# the default kube config location used by kind +export KUBECONFIG="${HOME}/.kube/config" # create namespace, permissions, and CRDs ./kubectl create -f manifests/setup