kubernetes
/
kube-state-metrics
mirror of https://github.com/kubernetes/kube-state-metrics.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: bump versions of prometheus, golangci, and minikube

This commit is contained in:
Tariq Ibrahim 2019-05-09 22:21:43 -07:00
parent d71e708c58
commit 018d3c831f
No known key found for this signature in database
GPG Key ID: DFC94E4A008B908A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ PKG=k8s.io/kube-state-metrics/pkg
GO_VERSION=1.12 GO_VERSION=1.12
FIRST_GOPATH:=$(firstword $(subst :, ,$(shell go env GOPATH))) FIRST_GOPATH:=$(firstword $(subst :, ,$(shell go env GOPATH)))
BENCHCMP_BINARY:=$(FIRST_GOPATH)/bin/benchcmp BENCHCMP_BINARY:=$(FIRST_GOPATH)/bin/benchcmp
GOLANGCI_VERSION := v1.15.0 GOLANGCI_VERSION := v1.16.0
HAS_GOLANGCI := $(shell which golangci-lint) HAS_GOLANGCI := $(shell which golangci-lint)
IMAGE = $(REGISTRY)/kube-state-metrics IMAGE = $(REGISTRY)/kube-state-metrics

4
tests/e2e.sh
View File

@ -20,11 +20,11 @@ set -o pipefail
KUBERNETES_VERSION=v1.14.1 KUBERNETES_VERSION=v1.14.1
KUBE_STATE_METRICS_LOG_DIR=./log KUBE_STATE_METRICS_LOG_DIR=./log
KUBE_STATE_METRICS_IMAGE_NAME='quay.io/coreos/kube-state-metrics' 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_MINIKUBE=${E2E_SETUP_MINIKUBE:-}
E2E_SETUP_KUBECTL=${E2E_SETUP_KUBECTL:-} E2E_SETUP_KUBECTL=${E2E_SETUP_KUBECTL:-}
E2E_SETUP_PROMTOOL=${E2E_SETUP_PROMTOOL:-} E2E_SETUP_PROMTOOL=${E2E_SETUP_PROMTOOL:-}
MINIKUBE_VERSION=v1.0.0 MINIKUBE_VERSION=v1.0.1
MINIKUBE_DRIVER=${MINIKUBE_DRIVER:-virtualbox} MINIKUBE_DRIVER=${MINIKUBE_DRIVER:-virtualbox}
SUDO=${SUDO:-} SUDO=${SUDO:-}