Skip to content

Commit 5f6ba57

Browse files
e-karchI763619
andauthored
Fix kubernikusctl auth refresh context (2) (#1049)
* Use currentContext from kubeconfig if user did not set context flag * Use context from kubeconfig to fetch credentials --------- Co-authored-by: I763619 <emil.karch@sap.com>
1 parent 24a7a53 commit 5f6ba57

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

pkg/cmd/kubernikusctl/auth/refresh.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,15 @@ func (o *RefreshOptions) Complete(args []string) (err error) {
7171

7272
func (o *RefreshOptions) Run(c *cobra.Command) error {
7373

74-
klog.V(2).Infof("Using context %v", o.context)
74+
if len(o.context) > 0 {
75+
klog.V(2).Infof("Using overridden context %v", o.context)
76+
}
7577
ktx, err := common.NewKubernikusContext(o.kubeconfigPath, o.context)
7678
if err != nil {
7779
return errors.Wrapf(err, "Failed to load kubeconfig")
7880
}
7981
if isKubernikusCtx, err := ktx.IsKubernikusContext(); err != nil || !isKubernikusCtx {
80-
klog.V(2).Infof("%s is not a valid Kubernikus context: %v", o.context, err)
82+
klog.V(2).Infof("%s is not a valid Kubernikus context: %v", ktx.Context(), err)
8183
return nil
8284
}
8385

@@ -151,8 +153,8 @@ func (o *RefreshOptions) Run(c *cobra.Command) error {
151153
return err
152154
}
153155

154-
fmt.Printf("Fetching credentials for %v from %v\n", o.context, o.url)
155-
kubeconfig, err := o.kubernikus.GetCredentials(o.context)
156+
fmt.Printf("Fetching credentials for %v from %v\n", ktx.Context(), o.url)
157+
kubeconfig, err := o.kubernikus.GetCredentials(ktx.Context())
156158
if err != nil {
157159
return errors.Wrap(err, "Couldn't fetch credentials from Kubernikus API")
158160
}

pkg/cmd/kubernikusctl/common/kubecontext.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ func (ktx *KubernikusContext) IsKubernikusContext() (bool, error) {
5454

5555
}
5656

57+
func (ktx *KubernikusContext) Context() string {
58+
return ktx.context
59+
}
60+
5761
func (ktx *KubernikusContext) UserCertificateValid() (bool, error) {
5862
cert, err := ktx.getClientCertificate()
5963
if err != nil {

0 commit comments

Comments
 (0)