Skip to content

Bug 1907947: cloud-creds-secret creation with current context info only #4484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 20, 2020
Merged

Bug 1907947: cloud-creds-secret creation with current context info only #4484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions pkg/asset/installconfig/kubevirt/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package kubevirt

import (
"context"
"io/ioutil"
"fmt"

nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
"github.com/pkg/errors"
Expand All @@ -16,6 +16,7 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
kubevirtapiv1 "kubevirt.io/client-go/api/v1"
cdiv1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1"
)
Expand Down Expand Up @@ -59,9 +60,36 @@ var (
// LoadKubeConfigContent returns the kubeconfig file content
func LoadKubeConfigContent() ([]byte, error) {
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
kubeConfigFilename := loadingRules.GetDefaultFilename()
configOverrides := &clientcmd.ConfigOverrides{}
clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, configOverrides)
rawConfig, err := clientConfig.RawConfig()
if err != nil {
return nil, err
}

// Remove anything that is not related to the current context from the result rawConfig
currentContextValue := rawConfig.Contexts[rawConfig.CurrentContext]
if currentContextValue == nil {
return nil, fmt.Errorf("currentContext is not included in rawConfig.Contexts")
}

rawConfig.Contexts = map[string]*clientcmdapi.Context{
rawConfig.CurrentContext: currentContextValue,
}

if v, ok := rawConfig.Clusters[currentContextValue.Cluster]; ok {
rawConfig.Clusters = map[string]*clientcmdapi.Cluster{
currentContextValue.Cluster: v,
}
}

if v, ok := rawConfig.AuthInfos[currentContextValue.AuthInfo]; ok {
rawConfig.AuthInfos = map[string]*clientcmdapi.AuthInfo{
currentContextValue.AuthInfo: v,
}
}

return ioutil.ReadFile(kubeConfigFilename)
return clientcmd.Write(rawConfig)
}

// NewClient creates our client wrapper object for the actual kubeVirt and kubernetes clients we use.
Expand Down