Skip to content

Commit

Permalink
Merge pull request #792 from reetasingh/master
Browse files Browse the repository at this point in the history
updating version for CI tools to latest stable versions. Fix #790
  • Loading branch information
k8s-ci-robot committed Jun 18, 2019
2 parents 5d9ecd2 + ae6a7a3 commit 4ee79c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.16.0
GOLANGCI_VERSION := v1.17.1
HAS_GOLANGCI := $(shell which golangci-lint)

IMAGE = $(REGISTRY)/kube-state-metrics
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
set -e
set -o pipefail

KUBERNETES_VERSION=v1.14.1
KUBERNETES_VERSION=v1.14.3
KUBE_STATE_METRICS_LOG_DIR=./log
KUBE_STATE_METRICS_IMAGE_NAME='quay.io/coreos/kube-state-metrics'
PROMETHEUS_VERSION=2.9.2
PROMETHEUS_VERSION=2.10.0
E2E_SETUP_MINIKUBE=${E2E_SETUP_MINIKUBE:-}
E2E_SETUP_KUBECTL=${E2E_SETUP_KUBECTL:-}
E2E_SETUP_PROMTOOL=${E2E_SETUP_PROMTOOL:-}
MINIKUBE_VERSION=v1.0.1
MINIKUBE_VERSION=v1.1.1
MINIKUBE_DRIVER=${MINIKUBE_DRIVER:-virtualbox}
SUDO=${SUDO:-}

Expand Down

0 comments on commit 4ee79c5

Please sign in to comment.