From 6f3e670af17aee6eb800450ca498fc86ed8c1cd8 Mon Sep 17 00:00:00 2001 From: Ratnadeep Debnath Date: Tue, 15 Nov 2016 14:15:04 +0530 Subject: [PATCH] Refactor openshift buildconfig CLI options. - Remove --buildconfig, -bc option. Create buildconfig if service has build info - Rename --branch to --build-branch - Rename --repo to --build-repo --- cli/command/command.go | 12 ++++------ cmd/convert.go | 32 +++++++++++--------------- pkg/app/app.go | 10 +++++--- pkg/kobject/kobject.go | 5 ++-- pkg/transformer/openshift/openshift.go | 4 ++-- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/cli/command/command.go b/cli/command/command.go index 654a0739..db4c917e 100644 --- a/cli/command/command.go +++ b/cli/command/command.go @@ -144,21 +144,17 @@ func ConvertOpenShiftCommand() cli.Command { Name: "deploymentconfig,dc", Usage: "Generate a OpenShift DeploymentConfig object", }, - cli.BoolFlag{ - Name: "buildconfig,bc", - Usage: "Generate a BuildConfig for Openshift", - }, cli.StringFlag{ - Name: "repo", + Name: "build-repo", Value: "", Usage: "Specify source repository for buildconfig (default remote origin)", - EnvVar: "REPO", + EnvVar: "BUILDREPO", }, cli.StringFlag{ - Name: "branch", + Name: "build-branch", Value: "master", Usage: "Specify repository branch to use for buildconfig (default master)", - EnvVar: "BRANCH", + EnvVar: "BUILDBRANCH", }, }, } diff --git a/cmd/convert.go b/cmd/convert.go index a3539f42..4ca69efd 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -26,12 +26,12 @@ import ( ) var ( - ConvertSource, ConvertOut, ConvertRepo, ConvertBranch string - ConvertChart, ConvertDeployment, ConvertDaemonSet bool - ConvertReplicationController, ConvertYaml, ConvertStdout bool - ConvertEmptyVols, ConvertDeploymentConfig, ConvertBuildConfig bool - ConvertReplicas int - ConvertOpt kobject.ConvertOptions + ConvertSource, ConvertOut, ConvertBuildRepo, ConvertBuildBranch string + ConvertChart, ConvertDeployment, ConvertDaemonSet bool + ConvertReplicationController, ConvertYaml, ConvertStdout bool + ConvertEmptyVols, ConvertDeploymentConfig, ConvertBuildConfig bool + ConvertReplicas int + ConvertOpt kobject.ConvertOptions ) var ConvertProvider string = GlobalProvider @@ -53,9 +53,8 @@ var convertCmd = &cobra.Command{ CreateD: ConvertDeployment, CreateDS: ConvertDaemonSet, CreateRC: ConvertReplicationController, - CreateBuildConfig: ConvertBuildConfig, - Repo: ConvertRepo, - Branch: ConvertBranch, + BuildRepo: ConvertBuildRepo, + BuildBranch: ConvertBuildBranch, CreateDeploymentConfig: ConvertDeploymentConfig, EmptyVols: ConvertEmptyVols, } @@ -87,12 +86,10 @@ func init() { // OpenShift only convertCmd.Flags().BoolVar(&ConvertDeploymentConfig, "deployment-config", true, "Generate an OpenShift deploymentconfig object") convertCmd.Flags().MarkHidden("deployment-config") - convertCmd.Flags().BoolVar(&ConvertBuildConfig, "build-config", false, "Generate an OpenShift buildconfig object") - convertCmd.Flags().MarkHidden("build-config") - convertCmd.Flags().StringVar(&ConvertRepo, "repo", "", "Specify source repository for buildconfig (default remote origin)") - convertCmd.Flags().MarkHidden("repo") - convertCmd.Flags().StringVar(&ConvertBranch, "branch", "master", "Specify repository branch to use for buildconfig (default master)") - convertCmd.Flags().MarkHidden("branch") + convertCmd.Flags().StringVar(&ConvertBuildRepo, "build-repo", "", "Specify source repository for buildconfig (default remote origin)") + convertCmd.Flags().MarkHidden("build-repo") + convertCmd.Flags().StringVar(&ConvertBuildBranch, "build-branch", "master", "Specify repository branch to use for buildconfig (default master)") + convertCmd.Flags().MarkHidden("build-branch") // Standard between the two convertCmd.Flags().BoolVarP(&ConvertYaml, "yaml", "y", false, "Generate resource files into yaml format") @@ -116,14 +113,13 @@ Available Commands:{{range .Commands}}{{if .IsAvailableCommand}} {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasAvailableLocalFlags}} Resource Flags: - --branch Specify repository branch to use for buildconfig (default master) - --build-config Generate an Openshift build config object + --build-branch Specify repository branch to use for buildconfig (default master) + --build-repo Specify source repository for buildconfig (default remote origin) -c, --chart Create a Helm chart for converted objects --daemon-set Generate a Kubernetes daemonset object -d, --deployment Generate a Kubernetes deployment object --deployment-config Generate an OpenShift deployment config object --replication-controller Generate a Kubernetes replication controller object - --repo Specify source repository for buildconfig (default remote origin) Flags: {{.LocalFlags.FlagUsages | trimRightSpace}}{{end}}{{ if .HasAvailableInheritedFlags}} diff --git a/pkg/app/app.go b/pkg/app/app.go index fd76d9e6..0f511634 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -63,7 +63,8 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec // OpenShift specific flags deploymentConfig := cmd.Flags().Lookup("deployment-config").Changed - buildConfig := cmd.Flags().Lookup("build-config").Changed + buildRepo := cmd.Flags().Lookup("build-repo").Changed + buildBranch := cmd.Flags().Lookup("build-branch").Changed // Kubernetes specific flags chart := cmd.Flags().Lookup("chart").Changed @@ -90,8 +91,11 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec if deploymentConfig { logrus.Fatalf("--deployment-config is an OpenShift only flag") } - if buildConfig { - logrus.Fatalf("--build-config is an Openshift only flag") + if buildRepo { + logrus.Fatalf("--build-repo is an Openshift only flag") + } + if buildBranch { + logrus.Fatalf("--build-branch is an Openshift only flag") } } diff --git a/pkg/kobject/kobject.go b/pkg/kobject/kobject.go index af2eb480..cfe907b0 100644 --- a/pkg/kobject/kobject.go +++ b/pkg/kobject/kobject.go @@ -33,9 +33,8 @@ type ConvertOptions struct { CreateRC bool CreateDS bool CreateDeploymentConfig bool - CreateBuildConfig bool - Repo string - Branch string + BuildRepo string + BuildBranch string CreateChart bool GenerateYaml bool EmptyVols bool diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 47df58c7..31495595 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -305,8 +305,8 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C objects = append(objects, o.initImageStream(name, service)) } - if opt.CreateBuildConfig && service.Build != "" { - objects = append(objects, initBuildConfig(name, service, opt.InputFile, opt.Repo, opt.Branch)) // Openshift BuildConfigs + if service.Build != "" { + objects = append(objects, initBuildConfig(name, service, opt.InputFile, opt.BuildRepo, opt.BuildBranch)) // Openshift BuildConfigs } // If ports not provided in configuration we will not make service