From a7246a693dd947cf580c4ee15aec5d164b4fbda8 Mon Sep 17 00:00:00 2001 From: zouyee Date: Mon, 8 Jan 2018 22:04:06 +0800 Subject: [PATCH] bump image version and README --- README.md | 4 ++-- kubernetes/kube-state-metrics-deployment.yaml | 1 + scripts/e2e.sh | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c66b55d9c0..486e5146eb 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,8 @@ release. #### Container Image The latest container image can be found at: -* `quay.io/coreos/kube-state-metrics:v1.1.0` -* `k8s.gcr.io/kube-state-metrics:v1.1.0` +* `quay.io/coreos/kube-state-metrics:v1.2.0-rc.0` +* `k8s.gcr.io/kube-state-metrics:v1.2.0-rc.0` **Note**: The recommended docker registry for kube-state-metrics is `quay.io`. kube-state-metrics on diff --git a/kubernetes/kube-state-metrics-deployment.yaml b/kubernetes/kube-state-metrics-deployment.yaml index 0e30921b15..1cca7243e1 100644 --- a/kubernetes/kube-state-metrics-deployment.yaml +++ b/kubernetes/kube-state-metrics-deployment.yaml @@ -1,4 +1,5 @@ apiVersion: apps/v1beta2 +# Kubernetes versions after 1.9.0 should use apps/v1 kind: Deployment metadata: name: kube-state-metrics diff --git a/scripts/e2e.sh b/scripts/e2e.sh index cea85d6df5..7b4888fb8e 100755 --- a/scripts/e2e.sh +++ b/scripts/e2e.sh @@ -21,7 +21,7 @@ KUBERNETES_VERSION=v1.8.0 KUBE_STATE_METRICS_LOG_DIR=./log KUBE_STATE_METRICS_IMAGE_NAME='quay.io/coreos/kube-state-metrics' KUBE_STATE_METRICS_IMAGE_NAME_PATTERN='quay.io\/coreos\/kube-state-metrics' -PROMETHEUS_VERSION=1.8.1 +PROMETHEUS_VERSION=2.0.0 mkdir -p $KUBE_STATE_METRICS_LOG_DIR @@ -40,7 +40,7 @@ mkdir $HOME/.kube || true touch $HOME/.kube/config export KUBECONFIG=$HOME/.kube/config -sudo minikube start --vm-driver=none --kubernetes-version=$KUBERNETES_VERSION +sudo minikube start --vm-driver=none --kubernetes-version=$KUBERNETES_VERSION --logtostderr minikube update-context @@ -129,7 +129,7 @@ curl -s "http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube echo "check metrics format with promtool" wget -q -O /tmp/prometheus.tar.gz https://github.com/prometheus/prometheus/releases/download/v$PROMETHEUS_VERSION/prometheus-$PROMETHEUS_VERSION.linux-amd64.tar.gz tar zxfv /tmp/prometheus.tar.gz -C /tmp -cat $KUBE_STATE_METRICS_LOG_DIR/metrics | /tmp/prometheus-$PROMETHEUS_VERSION.linux-amd64/promtool check-metrics +cat $KUBE_STATE_METRICS_LOG_DIR/metrics | /tmp/prometheus-$PROMETHEUS_VERSION.linux-amd64/promtool check metrics KUBE_STATE_METRICS_STATUS=$(curl -s "http://localhost:8001/api/v1/proxy/namespaces/kube-system/services/kube-state-metrics:8080/healthz") if [ "$KUBE_STATE_METRICS_STATUS" == "ok" ]; then