This commit is contained in:
Manuel 2025-01-23 12:07:06 -05:00 committed by GitHub
commit 43be8836fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 5 deletions

View File

@ -15,6 +15,7 @@
package main
import (
"cmp"
"io/ioutil"
"os"
"path/filepath"
@ -25,7 +26,7 @@ import (
)
func kubectxPrevCtxFile() (string, error) {
home := cmdutil.HomeDir()
home := cmp.Or(os.Getenv("KUBECTX_DIR"), cmdutil.HomeDir())
if home == "" {
return "", errors.New("HOME or USERPROFILE environment variable not set")
}

View File

@ -16,6 +16,7 @@ package main
import (
"bytes"
"cmp"
"io/ioutil"
"os"
"path/filepath"
@ -25,7 +26,7 @@ import (
"github.com/ahmetb/kubectx/internal/cmdutil"
)
var defaultDir = filepath.Join(cmdutil.HomeDir(), ".kube", "kubens")
var defaultDir = filepath.Join(cmp.Or(os.Getenv("KUBECTX_DIR"), cmdutil.HomeDir()), ".kube", "kubens")
type NSFile struct {
dir string

View File

@ -15,6 +15,7 @@
package kubeconfig
import (
"cmp"
"github.com/ahmetb/kubectx/internal/cmdutil"
"os"
"path/filepath"
@ -68,7 +69,7 @@ func kubeconfigPath() (string, error) {
}
// default path
home := cmdutil.HomeDir()
home := cmp.Or(os.Getenv("KUBECTX_DIR"), cmdutil.HomeDir())
if home == "" {
return "", errors.New("HOME or USERPROFILE environment variable not set")
}

View File

@ -23,7 +23,8 @@ IFS=$'\n\t'
SELF_CMD="$0"
KUBECTX="${XDG_CACHE_HOME:-$HOME/.kube}/kubectx"
[ -v KUBECTX_DIR ] && KUBECTX_DIR=${KUBECTX_DIR}/.kube/kubectx
KUBECTX="${KUBECTX_DIR:-${XDG_CACHE_HOME:-$HOME/.kube}/kubectx}"
usage() {
local SELF

3
kubens
View File

@ -23,7 +23,8 @@ IFS=$'\n\t'
SELF_CMD="$0"
KUBENS_DIR="${XDG_CACHE_HOME:-$HOME/.kube}/kubens"
[ -v KUBENS_DIR ] && KUBENS_DIR=${KUBENS_DIR}/.kube/kubectx
KUBENS_DIR="${KUBENS_DIR:-${XDG_CACHE_HOME:-$HOME/.kube}/kubectx}"
usage() {
local SELF