Changed the mg dev build and mg dev up flow. mg dev build now creates

and updates buildconfig's and imagestreams. mg dev up creates or updates
deployment and configuration related manifests.

Author: laetho

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/coreos/prometheus-operator v0.41.1
 	github.com/crossplane/crossplane-runtime v0.9.0 // indirect
 	github.com/crossplane/oam-kubernetes-runtime v0.0.9
+	github.com/ghodss/yaml v1.0.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/go-containerregistry v0.4.0
 	github.com/google/gofuzz v1.2.0 // indirect

mg/cmd/config.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The metaGraf Authors
+Copyright 2019-2021 The metaGraf Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

mg/cmd/dev.go

@@ -39,7 +39,6 @@ func init() {
 
 	devCmd.AddCommand(devCmdUp)
 	devCmdUp.Flags().StringVarP(&params.NameSpace, "namespace", "n", "", "namespace to work on, if not supplied it will use current active namespace.")
-	devCmdUp.Flags().StringVar(&params.SourceRef, "ref", "", "use for overriding source ref or branch ref in buildconfig.")
 	devCmdUp.Flags().StringSliceVar(&CVars, "cvars", []string{}, "Slice of key=value pairs, seperated by ,")
 	devCmdUp.Flags().StringVar(&params.PropertiesFile, "cvfile", "", "Property file with component configuration values. Can be generated with \"mg generate properties\" command.)")
 	devCmdUp.Flags().StringVar(&OName, "name", "", "Overrides name of application.")
@@ -59,6 +58,7 @@ func init() {
 	devCmdDown.Flags().StringVar(&OName, "name", "", "Overrides name of application.")
 
 	devCmd.AddCommand(devCmdBuild)
+	devCmdBuild.Flags().StringVar(&params.SourceRef, "ref", "master", "Specify the git ref or branch ref to build.")
 	devCmdBuild.Flags().StringVarP(&params.NameSpace, "namespace", "n", "", "namespace to work on, if not supplied it will use current active namespace.")
 	devCmdBuild.Flags().BoolVar(&params.LocalBuild, "local", false, "Builds application from src in current (.) direcotry.")
 }
@@ -110,6 +110,17 @@ var devCmdBuild = &cobra.Command{
 		mg := metagraf.Parse(args[0])
 		bc := mg.Name(OName, Version)
 
+		FlagPassingHack()
+		modules.NameSpace = params.NameSpace
+
+		// Remove RepSecRef from generated BuildConfig if --local argument is provided.
+		if params.LocalBuild && len(mg.Spec.RepSecRef) > 0 {
+			mg.Spec.RepSecRef = ""
+		}
+
+		modules.GenImageStream(&mg, params.NameSpace)
+		modules.GenBuildConfig(&mg)
+
 		path, err := exec.LookPath("oc")
 		if err != nil {
 			log.Fatal(err)
@@ -143,8 +154,6 @@ func devUp(mgf string) {
 	modules.PullPolicy = corev1.PullAlways
 	modules.GenSecrets(&mg)
 	modules.GenConfigMaps(&mg)
-	modules.GenImageStream(&mg, params.NameSpace)
-	modules.GenBuildConfig(&mg)
 	modules.GenDeploymentConfig(&mg)
 	modules.GenService(&mg)
 	modules.GenRoute(&mg)

mg/cmd/kaniko.go

@@ -177,7 +177,7 @@ var kanikoCreateRegistryCredentialsCmd = &cobra.Command{
 			if err != nil {
 				log.Fatal(err)
 			}
-			fmt.Println("created secret: %v", res.Name)
+			fmt.Printf("created secret: %v", res.Name)
 		}
 
 		if Output {

pkg/modules/buildconfig.go

@@ -185,16 +185,21 @@ func genGitBuildSource(mg *metagraf.MetaGraf) buildv1.BuildSource {
 		branch = mg.Spec.Branch
 	}
 
-	return buildv1.BuildSource{
+	bs := buildv1.BuildSource{
 		Type: "Git",
 		Git: &buildv1.GitBuildSource{
 			URI: mg.Spec.Repository,
 			Ref: branch,
 		},
-		SourceSecret: &corev1.LocalObjectReference{
+	}
+
+	if len(mg.Spec.RepSecRef) > 0 {
+		bs.SourceSecret = &corev1.LocalObjectReference{
 			Name: mg.Spec.RepSecRef,
-		},
+		}
 	}
+
+	return bs
 }
 
 func StoreBuildConfig(obj buildv1.BuildConfig) {