Skip to content
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.

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

Add Minify and Flatten for In-cluster deployment with Minikube #588

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
62 changes: 47 additions & 15 deletions utils/kubernetes/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import (
func DetectKubeConfig(configfile []byte) (config *rest.Config, err error) {
if len(configfile) > 0 {
var cfgFile []byte
cfgFile, err = processConfig(configfile)

_, cfgFile, err = ProcessConfig(configfile, "")
if err != nil {
return nil, err
}
Expand All @@ -32,40 +33,71 @@ func DetectKubeConfig(configfile []byte) (config *rest.Config, err error) {
// Look for kubeconfig from the path mentioned in $KUBECONFIG
kubeconfig := os.Getenv("KUBECONFIG")
if kubeconfig != "" {
if config, err = clientcmd.BuildConfigFromFlags("", kubeconfig); err == nil {
_, cfgFile, err := ProcessConfig(kubeconfig, "")
if err != nil {
return nil, err
}
if config, err = clientcmd.RESTConfigFromKubeConfig(cfgFile); err == nil {
return config, err
}
}

// Look for kubeconfig at the default path
path := filepath.Join(utils.GetHome(), ".kube", "config")
if config, err = clientcmd.BuildConfigFromFlags("", path); err == nil {
_, cfgFile, err := ProcessConfig(path, "")
if err != nil{
return nil, err
}
if config, err = clientcmd.RESTConfigFromKubeConfig(cfgFile); err == nil {
return config, err
}

return
}

func processConfig(configFile []byte) ([]byte, error) {
cfg, err := clientcmd.Load(configFile)
// ProcessConfig handles loading, validating, and optionally saving or returning a kubeconfig
func ProcessConfig(kubeConfig interface{}, outputPath string) (*clientcmdapi.Config, []byte, error) {
var config *clientcmdapi.Config
var err error

// Load the Kubeconfig
switch v := kubeConfig.(type) {
case string:
config, err = clientcmd.LoadFromFile(v)
case []byte:
config, err = clientcmd.Load(v)
default:
return nil, nil, ErrLoadConfig(err)
}
if err != nil {
return nil, ErrLoadConfig(err)
return nil, nil, err
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reuse/define a new meshkit error.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright Noted! Thank you for the review 😃

}

err = clientcmdapi.MinifyConfig(cfg)
if err != nil {
return nil, ErrValidateConfig(err)
// Validate and Process the Config
if err := clientcmdapi.MinifyConfig(config); err != nil {
return nil, nil, ErrValidateConfig(err)
}

err = clientcmdapi.FlattenConfig(cfg)
if err != nil {
return nil, ErrValidateConfig(err)
if err := clientcmdapi.FlattenConfig(config); err != nil {
return nil, nil, ErrValidateConfig(err)
}

if err := clientcmd.Validate(*config); err != nil {
return nil, nil, ErrValidateConfig(err)
}

err = clientcmd.Validate(*cfg)
// Convert the config to []byte
configBytes, err := clientcmd.Write(*config)
if err != nil {
return nil, ErrValidateConfig(err)
return nil, nil, err
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reuse/define a new meshkit error.

}

//Save the Processed config to a file
if outputPath != ""{
if err := clientcmd.WriteToFile(*config, outputPath); err != nil {
return nil, nil, err
}
}

return clientcmd.Write(*cfg)
return config, configBytes, nil
}
Loading