diff --git a/Makefile b/Makefile index 93bdb254..d1477d78 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ PKG=k8s.io/kube-state-metrics/pkg GO_VERSION=1.12 FIRST_GOPATH:=$(firstword $(subst :, ,$(shell go env GOPATH))) BENCHCMP_BINARY:=$(FIRST_GOPATH)/bin/benchcmp -GOLANGCI_VERSION := v1.15.0 +GOLANGCI_VERSION := v1.16.0 HAS_GOLANGCI := $(shell which golangci-lint) IMAGE = $(REGISTRY)/kube-state-metrics diff --git a/tests/e2e.sh b/tests/e2e.sh index 5640a41a..d88b733c 100755 --- a/tests/e2e.sh +++ b/tests/e2e.sh @@ -20,11 +20,11 @@ set -o pipefail KUBERNETES_VERSION=v1.14.1 KUBE_STATE_METRICS_LOG_DIR=./log KUBE_STATE_METRICS_IMAGE_NAME='quay.io/coreos/kube-state-metrics' -PROMETHEUS_VERSION=2.9.1 +PROMETHEUS_VERSION=2.9.2 E2E_SETUP_MINIKUBE=${E2E_SETUP_MINIKUBE:-} E2E_SETUP_KUBECTL=${E2E_SETUP_KUBECTL:-} E2E_SETUP_PROMTOOL=${E2E_SETUP_PROMTOOL:-} -MINIKUBE_VERSION=v1.0.0 +MINIKUBE_VERSION=v1.0.1 MINIKUBE_DRIVER=${MINIKUBE_DRIVER:-virtualbox} SUDO=${SUDO:-}