generated from layer5io/layer5-repo-template
-
Notifications
You must be signed in to change notification settings - Fork 86
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
Alero-Awani
wants to merge
4
commits into
meshery:master
Choose a base branch
from
Alero-Awani:meshkit-minify
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
c01ff7b
Allow minify when meshery is installed in-cluster with minikube--auth…
Alero-Awani a6ad2c3
Create central function in meshkit for processing Kubeconfig files--a…
Alero-Awani ac9ec0f
Merge branch 'master' into meshkit-minify
leecalcote 5733cdc
Merge branch 'master' into meshkit-minify
MUzairS15 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
} | ||
|
@@ -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 | ||
} | ||
|
||
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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 😃