github/kubectx
1
0
Fork 0
mirror of https://github.com/ahmetb/kubectx.git synced 2025-07-31 23:00:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bats tests

Browse Source
This commit is contained in:
ultram4rine 2023-12-26 21:04:18 +04:00
parent 30ad213b37
commit 608b90a332
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/kubeconfig/contexts.go
View File

@ -33,7 +33,11 @@ func (k *Kubeconfig) contextsNode() (*yaml.RNode, error) {
}
func (k *Kubeconfig) contextNode(name string) (*yaml.RNode, error) {
context, err := k.config.Pipe(yaml.Lookup("contexts", "[name="+name+"]"))
contexts, err := k.contextsNode()
if err != nil {
return nil, err
}
context, err := contexts.Pipe(yaml.Lookup("[name=" + name + "]"))
if err != nil {
return nil, err
}

8
internal/kubeconfig/currentcontext.go
View File

@ -15,8 +15,6 @@
package kubeconfig
import (
"strings"
"sigs.k8s.io/kustomize/kyaml/yaml"
)
@ -27,11 +25,7 @@ func (k *Kubeconfig) GetCurrentContext() string {
if err != nil {
return ""
}
str, err := v.String()
if err != nil {
return ""
}
return strings.TrimSpace(str)
return yaml.GetValue(v)
}
func (k *Kubeconfig) UnsetCurrentContext() error {

8
internal/kubeconfig/namespace.go
View File

@ -15,8 +15,6 @@
package kubeconfig
import (
"strings"
"sigs.k8s.io/kustomize/kyaml/yaml"
)
@ -33,11 +31,7 @@ func (k *Kubeconfig) NamespaceOfContext(contextName string) (string, error) {
if namespace == nil || err != nil {
return defaultNamespace, err
}
nsStr, err := namespace.String()
if nsStr == "" || err != nil {
return defaultNamespace, err
}
return strings.TrimSpace(nsStr), nil
return yaml.GetValue(namespace), nil
}
func (k *Kubeconfig) SetNamespace(ctxName string, ns string) error {