Skip to content

Commit

Permalink
make startbuild cmd external
Browse files Browse the repository at this point in the history
  • Loading branch information
@juanvallejo
juanvallejo committed Jul 26, 2018
1 parent bb0bdb2 commit a97ffd0
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 54 deletions.
6 changes: 6 additions & 0 deletions contrib/completions/bash/oc
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions contrib/completions/zsh/oc
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

133 changes: 85 additions & 48 deletions pkg/oc/cli/startbuild/startbuild.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ import (
"time"

"github.com/golang/glog"
"github.com/openshift/origin/pkg/oc/util/ocscheme"
"github.com/spf13/cobra"

"github.com/openshift/source-to-image/pkg/tar"
s2ifs "github.com/openshift/source-to-image/pkg/util/fs"

corev1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -31,17 +33,17 @@ import (
"k8s.io/apimachinery/third_party/forked/golang/netutil"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api/legacyscheme"
kapi "k8s.io/kubernetes/pkg/apis/core"
kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"

"github.com/openshift/api/build"
buildapiv1 "github.com/openshift/api/build/v1"
buildv1 "github.com/openshift/api/build/v1"
buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
buildapi "github.com/openshift/origin/pkg/build/apis/build"
buildclientinternalmanual "github.com/openshift/origin/pkg/build/client/internalversion"
buildclientinternal "github.com/openshift/origin/pkg/build/generated/internalclientset"
buildclient "github.com/openshift/origin/pkg/build/generated/internalclientset/typed/build/internalversion"
buildclientmanual "github.com/openshift/origin/pkg/build/client/v1"
cmdutil "github.com/openshift/origin/pkg/cmd/util"
"github.com/openshift/origin/pkg/git"
ocerrors "github.com/openshift/origin/pkg/oc/lib/errors"
Expand Down Expand Up @@ -89,6 +91,10 @@ var (
)

type StartBuildOptions struct {
PrintFlags *genericclioptions.PrintFlags

Printer printers.ResourcePrinter

Git git.Repository

FromBuild string
Expand Down Expand Up @@ -116,14 +122,14 @@ type StartBuildOptions struct {
GitPostReceive string

Mapper meta.RESTMapper
BuildClient buildclient.BuildInterface
BuildLogClient buildclientinternalmanual.BuildLogInterface
BuildClient buildv1client.BuildV1Interface
BuildLogClient buildclientmanual.BuildLogInterface
ClientConfig *restclient.Config

AsBinary bool
ShortOutput bool
EnvVar []kapi.EnvVar
BuildArgs []kapi.EnvVar
EnvVar []corev1.EnvVar
BuildArgs []corev1.EnvVar
Name string
Namespace string

Expand All @@ -132,7 +138,8 @@ type StartBuildOptions struct {

func NewStartBuildOptions(streams genericclioptions.IOStreams) *StartBuildOptions {
return &StartBuildOptions{
IOStreams: streams,
PrintFlags: genericclioptions.NewPrintFlags("started").WithTypeSetter(ocscheme.PrintingInternalScheme),
IOStreams: streams,
}
}

Expand Down Expand Up @@ -174,7 +181,7 @@ func NewCmdStartBuild(fullName string, f kcmdutil.Factory, streams genericcliopt
cmd.Flags().StringVar(&o.GitPostReceive, "git-post-receive", o.GitPostReceive, "The contents of the post-receive hook to trigger a build")
cmd.Flags().StringVar(&o.GitRepository, "git-repository", o.GitRepository, "The path to the git repository for post-receive; defaults to the current directory")

kcmdutil.AddOutputFlagsForMutation(cmd)
o.PrintFlags.AddFlags(cmd)
return cmd
}

Expand Down Expand Up @@ -214,6 +221,11 @@ func (o *StartBuildOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, cmd
return fmt.Errorf("only one of --from-file, --from-repo, --from-archive or --from-dir may be specified")
}

o.Printer, err = o.PrintFlags.ToPrinter()
if err != nil {
return err
}

webhook := o.FromWebhook
buildName := o.FromBuild
buildLogLevel := o.LogLevel
Expand All @@ -238,20 +250,20 @@ func (o *StartBuildOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, cmd
return kcmdutil.UsageErrorf(cmd, "Must pass a name of a build config or specify build name with '--from-build' flag.\nUse \"%s get bc\" to list all available build configs.", cmdFullName)
}

namespace, _, err := f.ToRawKubeConfigLoader().Namespace()
clientConfig, err := f.ToRESTConfig()
if err != nil {
return err
}

clientConfig, err := f.ToRESTConfig()
o.Namespace, _, err = f.ToRawKubeConfigLoader().Namespace()
if err != nil {
return err
}
c, err := buildclientinternal.NewForConfig(clientConfig)

o.BuildClient, err = buildv1client.NewForConfig(clientConfig)
if err != nil {
return err
}
o.BuildClient = c.Build()

var (
name = buildName
Expand Down Expand Up @@ -281,7 +293,7 @@ func (o *StartBuildOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, cmd

// when listing webhooks, allow --from-build to lookup a build config
if build.Resource("builds") == resource && len(o.ListWebhooks) > 0 {
build, err := o.BuildClient.Builds(namespace).Get(name, metav1.GetOptions{})
build, err := o.BuildClient.Builds(o.Namespace).Get(name, metav1.GetOptions{})
if err != nil {
return err
}
Expand All @@ -290,34 +302,55 @@ func (o *StartBuildOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, cmd
return fmt.Errorf("the provided Build %q was not created from a BuildConfig and cannot have webhooks", name)
}
if len(ref.Namespace) > 0 {
namespace = ref.Namespace
o.Namespace = ref.Namespace
}
name = ref.Name
}

o.Namespace = namespace
o.Name = name

o.BuildLogClient = buildclientinternalmanual.NewBuildLogClient(o.BuildClient.RESTClient(), o.Namespace)
o.BuildLogClient = buildclientmanual.NewBuildLogClient(o.BuildClient.RESTClient(), o.Namespace)

// Handle environment variables
cmdutil.WarnAboutCommaSeparation(o.ErrOut, o.Env, "--env")
env, _, err := utilenv.ParseEnv(o.Env, o.In)
if err != nil {
return err
}

// convert internal envvars returned from the helper to external versions
externalEnv := []corev1.EnvVar{}
for _, internal := range env {
external := &corev1.EnvVar{}
if err := kapiv1.Convert_core_EnvVar_To_v1_EnvVar(&internal, external, nil); err != nil {
return err
}
externalEnv = append(externalEnv, *external)
}

if len(buildLogLevel) > 0 {
env = append(env, kapi.EnvVar{Name: "BUILD_LOGLEVEL", Value: buildLogLevel})
externalEnv = append(externalEnv, corev1.EnvVar{Name: "BUILD_LOGLEVEL", Value: buildLogLevel})
}
o.EnvVar = env
o.EnvVar = externalEnv

// Handle Docker build arguments. In order to leverage existing logic, we
// first create an EnvVar array, then convert it to []docker.BuildArg
buildArgs, err := utilenv.ParseBuildArg(o.Args, o.In)
if err != nil {
return err
}
o.BuildArgs = buildArgs

// convert internal buildargs returned from the helper to external versions
externalBuildArgs := []corev1.EnvVar{}
for _, internal := range buildArgs {
external := &corev1.EnvVar{}
if err := kapiv1.Convert_core_EnvVar_To_v1_EnvVar(&internal, external, nil); err != nil {
return err
}
externalBuildArgs = append(externalBuildArgs, *external)
}

o.BuildArgs = externalBuildArgs

return nil
}
Expand Down Expand Up @@ -358,17 +391,17 @@ func (o *StartBuildOptions) Run() error {
return o.RunListBuildWebHooks()
}

buildRequestCauses := []buildapi.BuildTriggerCause{}
request := &buildapi.BuildRequest{
buildRequestCauses := []buildv1.BuildTriggerCause{}
request := &buildv1.BuildRequest{
TriggeredBy: append(buildRequestCauses,
buildapi.BuildTriggerCause{
buildv1.BuildTriggerCause{
Message: buildapi.BuildTriggerCauseManualMsg,
},
),
ObjectMeta: metav1.ObjectMeta{Name: o.Name},
}

request.SourceStrategyOptions = &buildapi.SourceStrategyOptions{}
request.SourceStrategyOptions = &buildv1.SourceStrategyOptions{}
if o.IncrementalOverride {
request.SourceStrategyOptions.Incremental = &o.Incremental
}
Expand All @@ -377,7 +410,7 @@ func (o *StartBuildOptions) Run() error {
request.Env = o.EnvVar
}

request.DockerStrategyOptions = &buildapi.DockerStrategyOptions{}
request.DockerStrategyOptions = &buildv1.DockerStrategyOptions{}
if len(o.BuildArgs) > 0 {
request.DockerStrategyOptions.BuildArgs = o.BuildArgs
}
Expand All @@ -387,18 +420,18 @@ func (o *StartBuildOptions) Run() error {
}

if len(o.Commit) > 0 {
request.Revision = &buildapi.SourceRevision{
Git: &buildapi.GitSourceRevision{
request.Revision = &buildv1.SourceRevision{
Git: &buildv1.GitSourceRevision{
Commit: o.Commit,
},
}
}

var err error
var newBuild *buildapi.Build
var newBuild *buildv1.Build
switch {
case o.AsBinary:
request := &buildapi.BinaryBuildRequestOptions{
request := &buildv1.BinaryBuildRequestOptions{
ObjectMeta: metav1.ObjectMeta{
Name: o.Name,
Namespace: o.Namespace,
Expand All @@ -411,7 +444,7 @@ func (o *StartBuildOptions) Run() error {
if len(o.BuildArgs) > 0 {
fmt.Fprintf(o.ErrOut, "WARNING: Specifying build arguments with binary builds is not supported.\n")
}
instantiateClient := buildclientinternalmanual.NewBuildInstantiateBinaryClient(o.BuildClient.RESTClient(), o.Namespace)
instantiateClient := buildclientmanual.NewBuildInstantiateBinaryClient(o.BuildClient.RESTClient(), o.Namespace)
if newBuild, err = streamPathToBuild(o.Git, o.In, o.ErrOut, instantiateClient, o.FromDir, o.FromFile, o.FromRepo, request); err != nil {
if kerrors.IsAlreadyExists(err) {
return transformIsAlreadyExistsError(err, o.Name)
Expand Down Expand Up @@ -440,7 +473,9 @@ func (o *StartBuildOptions) Run() error {
}
}

kcmdutil.PrintSuccess(o.ShortOutput, o.Out, newBuild, false, "started")
if err := o.Printer.PrintObj(newBuild, o.Out); err != nil {
fmt.Fprintf(o.ErrOut, "error: %v\n", err)
}

// Stream the logs from the build
if o.Follow {
Expand All @@ -457,8 +492,8 @@ func (o *StartBuildOptions) Run() error {
return nil
}

func (o *StartBuildOptions) streamBuildLogs(build *buildapi.Build) error {
opts := buildapi.BuildLogOptions{
func (o *StartBuildOptions) streamBuildLogs(build *buildv1.Build) error {
opts := buildv1.BuildLogOptions{
Follow: true,
NoWait: false,
}
Expand Down Expand Up @@ -504,7 +539,7 @@ func (o *StartBuildOptions) RunListBuildWebHooks() error {
return err
}

webhookClient := buildclientinternalmanual.NewWebhookURLClient(o.BuildClient.RESTClient(), o.Namespace)
webhookClient := buildclientmanual.NewWebhookURLClient(o.BuildClient.RESTClient(), o.Namespace)
for _, t := range config.Spec.Triggers {
hookType := ""
switch {
Expand All @@ -521,7 +556,7 @@ func (o *StartBuildOptions) RunListBuildWebHooks() error {
}
u, err := webhookClient.WebHookURL(o.Name, &t)
if err != nil {
if err != buildclientinternalmanual.ErrTriggerIsNotAWebHook {
if err != buildclientmanual.ErrTriggerIsNotAWebHook {
fmt.Fprintf(o.ErrOut, "error: unable to get webhook for %s: %v", o.Name, err)
}
continue
Expand All @@ -532,7 +567,7 @@ func (o *StartBuildOptions) RunListBuildWebHooks() error {
return nil
}

func streamPathToBuild(repo git.Repository, in io.Reader, out io.Writer, client buildclientinternalmanual.BuildInstantiateBinaryInterface, fromDir, fromFile, fromRepo string, options *buildapi.BinaryBuildRequestOptions) (*buildapi.Build, error) {
func streamPathToBuild(repo git.Repository, in io.Reader, out io.Writer, client buildclientmanual.BuildInstantiateBinaryInterface, fromDir, fromFile, fromRepo string, options *buildv1.BinaryBuildRequestOptions) (*buildv1.Build, error) {
asDir, asFile, asRepo := len(fromDir) > 0, len(fromFile) > 0, len(fromRepo) > 0

if asRepo && !git.IsGitInstalled() {
Expand Down Expand Up @@ -829,12 +864,14 @@ func (o *StartBuildOptions) RunStartBuildWebHook() error {
if len(body) > 0 {
// In later server versions we return the created Build in the body.
var newBuild buildapi.Build
if err = json.Unmarshal(body, &buildapiv1.Build{}); err == nil {
if err = json.Unmarshal(body, &buildv1.Build{}); err == nil {
if err = runtime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), body, &newBuild); err != nil {
return err
}

kcmdutil.PrintSuccess(o.ShortOutput, o.Out, &newBuild, false, "started")
if err := o.Printer.PrintObj(&newBuild, o.Out); err != nil {
return err
}
}
}

Expand Down Expand Up @@ -915,14 +952,14 @@ func gitRefInfo(repo git.Repository, dir, ref string) (buildapi.GitRefInfo, erro
}

// WaitForBuildComplete waits for a build identified by the name to complete
func WaitForBuildComplete(c buildclient.BuildResourceInterface, name string) error {
isOK := func(b *buildapi.Build) bool {
return b.Status.Phase == buildapi.BuildPhaseComplete
func WaitForBuildComplete(c buildv1client.BuildInterface, name string) error {
isOK := func(b *buildv1.Build) bool {
return b.Status.Phase == buildv1.BuildPhaseComplete
}
isFailed := func(b *buildapi.Build) bool {
return b.Status.Phase == buildapi.BuildPhaseFailed ||
b.Status.Phase == buildapi.BuildPhaseCancelled ||
b.Status.Phase == buildapi.BuildPhaseError
isFailed := func(b *buildv1.Build) bool {
return b.Status.Phase == buildv1.BuildPhaseFailed ||
b.Status.Phase == buildv1.BuildPhaseCancelled ||
b.Status.Phase == buildv1.BuildPhaseError
}
for {
list, err := c.List(metav1.ListOptions{FieldSelector: fields.Set{"metadata.name": name}.AsSelector().String()})
Expand Down Expand Up @@ -951,7 +988,7 @@ func WaitForBuildComplete(c buildclient.BuildResourceInterface, name string) err
// reget and re-watch
break
}
if e, ok := val.Object.(*buildapi.Build); ok {
if e, ok := val.Object.(*buildv1.Build); ok {
if name == e.Name && isOK(e) {
return nil
}
Expand Down
Loading

0 comments on commit a97ffd0

Please sign in to comment.