Allow specifying repo,branch info for buildconfig over CLI.

kubernetes · Nov 3, 2016 · 4ee7d2a · 4ee7d2a
1 parent 5763ca8
commit 4ee7d2a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/cli/app/app.go b/cli/app/app.go
@@ -140,6 +140,8 @@ func Convert(c *cli.Context) {
 		CreateDS:               c.BoolT("daemonset"),
 		CreateRC:               c.BoolT("replicationcontroller"),
 		CreateBuildConfig:      c.BoolT("buildconfig"),
+		Repo:                   c.String("repo"),
+		Branch:                 c.String("branch"),
 		CreateDeploymentConfig: c.BoolT("deploymentconfig"),
 	}
 

diff --git a/cli/command/command.go b/cli/command/command.go
@@ -123,6 +123,18 @@ func ConvertOpenShiftCommand() cli.Command {
 				Name:  "buildconfig,bc",
 				Usage: "Generate a BuildConfig for Openshift",
 			},
+			cli.StringFlag{
+				Name:   "repo",
+				Value:  "",
+				Usage:  "Specify source repository for buildconfig (default remote origin)",
+				EnvVar: "REPO",
+			},
+			cli.StringFlag{
+				Name:   "branch",
+				Value:  "master",
+				Usage:  "Specify repository branch to use for buildconfig (default master)",
+				EnvVar: "BRANCH",
+			},
 		},
 	}
 	command.Flags = append(command.Flags, commonConvertFlags()...)

diff --git a/pkg/kobject/kobject.go b/pkg/kobject/kobject.go
@@ -113,6 +113,8 @@ type ConvertOptions struct {
 	CreateDS               bool
 	CreateDeploymentConfig bool
 	CreateBuildConfig      bool
+	Repo                   string
+	Branch                 string
 	CreateChart            bool
 	GenerateYaml           bool
 	Replicas               int

diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go
@@ -132,7 +132,12 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig)
 }
 
 // initBuildConfig initialize Openshifts BuildConfig Object
-func initBuildConfig(name string, service kobject.ServiceConfig, inputFile string) *buildapi.BuildConfig {
+func initBuildConfig(name string, service kobject.ServiceConfig, inputFile string, repo string, branch string) *buildapi.BuildConfig {
+	uri := repo
+	if uri != "" {
+		uri = getGitRemote("origin")
+	}
+
 	bc := &buildapi.BuildConfig{
 		TypeMeta: unversioned.TypeMeta{
 			Kind:       "BuildConfig",
@@ -152,8 +157,8 @@ func initBuildConfig(name string, service kobject.ServiceConfig, inputFile strin
 			buildapi.CommonSpec{
 				Source: buildapi.BuildSource{
 					Git: &buildapi.GitBuildSource{
-						Ref: "master",
-						URI: getGitRemote("origin"),
+						Ref: branch,
+						URI: uri,
 					},
 					ContextDir: getAbsBuildContext(service.Build, inputFile),
 				},
@@ -242,7 +247,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
 		}
 
 		if opt.CreateBuildConfig && service.Build != "" {
-			objects = append(objects, initBuildConfig(name, service, opt.InputFile)) // Openshift BuildConfigs
+			objects = append(objects, initBuildConfig(name, service, opt.InputFile, opt.Repo, opt.Branch)) // Openshift BuildConfigs
 		}
 
 		// If ports not provided in configuration we will not make service