easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #500 from lilic/bump-1.18

Browse Source 
Test against kubernetes 1.18 release
This commit is contained in:
Frederic Branczyk
2020-04-20 14:07:42 +02:00
committed by GitHub
parent dcc46c8aa8 626f1af8c0
commit a1cf984749
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@@ -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: To try out this stack, start [minikube](https://github.com/kubernetes/minikube) with the following command:
```shell ```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: 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 ### Kubernetes compatibility matrix
| kube-prometheus stack | Kubernetes 1.14 | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
|-----------------------|-----------------|-----------------|-----------------|-----------------|
| `release-0.3` | ✔ | ✔ | ✔ | ✔ | | kube-prometheus stack | Kubernetes 1.14 | Kubernetes 1.15 | Kubernetes 1.16 | Kubernetes 1.17 | Kubernetes 1.18 |
| `release-0.4` | ✗ | ✗ | ✔ | ✔ | |-----------------------|-----------------|-----------------|-----------------|-----------------|-----------------|
| `HEAD` | ✗ | ✗ | ✗ | ✔ | | `release-0.3` | ✔ | ✔ | ✔ | ✔ | ✗
| `release-0.4` | ✗ | ✗ | ✔ | ✔ | ✗
| `release-0.5` | ✗ | ✗ | ✗ | ✔ | ✔
| `HEAD` | ✗ | ✗ | ✗ | ✗ | ✔
## Quickstart ## 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). 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).

2
scripts/minikube-start.sh
View File

@@ -2,7 +2,7 @@
minikube delete minikube delete
minikube addons disable metrics-server minikube addons disable metrics-server
minikube start \ minikube start \
--kubernetes-version=v1.16.0 \ --kubernetes-version=v1.18.1 \
--memory=6g \ --memory=6g \
--bootstrapper=kubeadm \ --bootstrapper=kubeadm \
--extra-config=kubelet.authentication-token-webhook=true \ --extra-config=kubelet.authentication-token-webhook=true \

7
tests/e2e/travis-e2e.sh
View File

@@ -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 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 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 chmod +x kind
./kind create cluster --image=kindest/node:v1.17.0 ./kind create cluster --image=kindest/node:v1.18.0
export KUBECONFIG="$(./kind get kubeconfig-path)" # the default kube config location used by kind
export KUBECONFIG="${HOME}/.kube/config"
# create namespace, permissions, and CRDs # create namespace, permissions, and CRDs
./kubectl create -f manifests/setup ./kubectl create -f manifests/setup