From c845c3c96baacfc2917da3da559d40b0988442dd Mon Sep 17 00:00:00 2001
From: Chance Zibolski <chance.zibolski@coreos.com>
Date: Fri, 30 Dec 2016 11:39:25 -0800
Subject: [PATCH] Don't pass $KUBECONFIG to kubectl --kubeconfig flag
The $KUBECONFIG variable is like $PATH, and supports multiple files
separated by `:`, but --kubeconfig only takes a single file as a value.
Since kubectl picks up the $KUBECONFIG variable already, don't pass it
to kubectl.
Also, use --namespace instead of -n to support older kubectl versions.
---
hack/cluster-monitoring/deploy | 6 +++---
hack/cluster-monitoring/teardown | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index 95a1b54b..25220dd8 100755
--- a/hack/cluster-monitoring/deploy
+++ b/hack/cluster-monitoring/deploy
@@ -1,17 +1,17 @@
#!/usr/bin/env bash
if [ -z "${KUBECONFIG}" ]; then
- KUBECONFIG=~/.kube/config
+ export KUBECONFIG=~/.kube/config
fi
if [ -z "${NAMESPACE}" ]; then
NAMESPACE=monitoring
fi
-kubectl --kubeconfig="$KUBECONFIG" create namespace "$NAMESPACE"
+kubectl create namespace "$NAMESPACE"
kctl() {
- kubectl --kubeconfig="$KUBECONFIG" -n "$NAMESPACE" "$@"
+ kubectl --namespace "$NAMESPACE" "$@"
}
kctl create -f manifests/prometheus-operator.yaml
diff --git a/hack/cluster-monitoring/teardown b/hack/cluster-monitoring/teardown
index 490979a1..c8a60c9b 100755
--- a/hack/cluster-monitoring/teardown
+++ b/hack/cluster-monitoring/teardown
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
if [ -z "${KUBECONFIG}" ]; then
- KUBECONFIG=~/.kube/config
+ export KUBECONFIG=~/.kube/config
fi
if [ -z "${NAMESPACE}" ]; then
@@ -9,7 +9,7 @@ if [ -z "${NAMESPACE}" ]; then
fi
kctl() {
- kubectl --kubeconfig="$KUBECONFIG" -n "$NAMESPACE" "$@"
+ kubectl --namespace "$NAMESPACE" "$@"
}
kctl delete -f manifests/exporters
--
GitLab