Skip to content

K
k3s
Commit 8ecfd967 authored by Mike Danese's avatar Mike Danese
Browse files
Options

use current-context from .kube/config when getting cluster credentials

parent 17e36b02
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cluster/common.sh
View file @ 8ecfd967
......@@ -179,7 +179,7 @@ function gen-kube-basicauth() {
function get-kubeconfig-bearertoken() {
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
local cc="current-context"
local cc=$("${KUBE_ROOT}/cluster/kubectl.sh" config view -o jsonpath="{.current-context}")
if [[ ! -z "${KUBE_CONTEXT:-}" ]]; then
cc="${KUBE_CONTEXT}"
fi
......@@ -229,7 +229,7 @@ function load-or-gen-kube-bearertoken() {
function detect-master-from-kubeconfig() {
export KUBECONFIG=${KUBECONFIG:-$DEFAULT_KUBECONFIG}
local cc="current-context"
local cc=$("${KUBE_ROOT}/cluster/kubectl.sh" config view -o jsonpath="{.current-context}")
if [[ ! -z "${KUBE_CONTEXT:-}" ]]; then
cc="${KUBE_CONTEXT}"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment