Commit e12ee2d3 authored by SWE CI's avatar SWE CI

Merge branch 'release/v0.3.1'

parents 641990a8 70356b19
Pipeline #34738 passed with stage
in 20 seconds
......@@ -49,6 +49,8 @@ var buildCmd = &cobra.Command{
fixKubectlContext()
helmUpdate()
conf, err := config.New(configFile)
if err != nil {
color.New(color.FgRed).Printf("Error reading configuration file: %s\n", configFile)
......
......@@ -32,26 +32,32 @@ var cleanCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
environment.EvalDockerEnv()
fixKubectlContext()
err := environment.Run(true, "minikube", "status")
if err != nil {
color.Red("Minikube is not started... run `devtool start` first.")
return
}
conf, err := config.New(configFile)
if err != nil {
color.New(color.FgRed).Printf("Error reading configuration file: %s\n", configFile)
return
}
if cleanAll {
err = cleanAllHelm()
if err != nil {
color.Red("Failed to clean helm releases.")
return
}
} else {
conf, err := config.New(configFile)
if err != nil {
color.New(color.FgRed).Printf("Error reading configuration file: %s\n", configFile)
return
}
err = cleanHelm(conf)
}
if err != nil {
color.Red("Failed to clean helm releases.")
return
if err != nil {
color.Red("Failed to clean helm releases.")
return
}
}
},
}
......
......@@ -91,11 +91,11 @@ func initConfig() {
viper.SetEnvKeyReplacer(replacer)
// If a config file is found, read it in.
// if err := viper.ReadInConfig(); err == nil {
// fmt.Println("Using config file:", viper.ConfigFileUsed())
// } else {
// color.Red(err.Error())
// }
if err := viper.ReadInConfig(); err == nil {
fmt.Println("Using config file:", viper.ConfigFileUsed())
} else {
color.Red(err.Error())
}
}
func PrintLogo() {
......
......@@ -79,7 +79,6 @@ func start(memory, cpu string) {
return
}
environment.RunRequired(true, "helm", "repo", "add", "qa", "https://charts.qa.k8s.psu.edu")
environment.RunRequired(true, "helm", "repo", "add", "cm", "https://cm.qa.k8s.psu.edu")
color.Blue("Setting up Minikube environment.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment