Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/openshift/ci-tools

replace github.com/golang/lint => golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d

replace k8s.io/client-go => k8s.io/client-go v0.0.0-20180718001006-59698c7d9724
replace (
github.com/golang/lint => golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
k8s.io/client-go => k8s.io/client-go v0.0.0-20190409021438-1a26190bd76a
)

require (
cloud.google.com/go v0.37.4
Expand All @@ -21,10 +21,10 @@ require (
github.com/shurcooL/githubv4 v0.0.0-20180925043049-51d7b505e2e9
github.com/sirupsen/logrus v1.4.2
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
golang.org/x/sync v0.0.0-20190423024810-112230192c58
google.golang.org/api v0.3.2
k8s.io/api v0.0.0-20181128191700-6db15a15d2d3
k8s.io/apimachinery v0.0.0-20181128191346-49ce2735e507
k8s.io/client-go v9.0.0+incompatible
k8s.io/test-infra v0.0.0-20190610154516-e6c6e17e9827
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/test-infra v0.0.0-20190724123615-0c63ed72976e
)
162 changes: 125 additions & 37 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/config/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (c *TemplateCMManager) createCM(name string, data []updateconfig.ConfigMapU
}
if _, err := c.cmclient.Create(cm); err != nil && !kerrors.IsAlreadyExists(err) {
return err
} else if err := updateconfig.Update(osFileGetter{root: c.releaseRepoPath}, c.cmclient, cm.Name, "", data, c.logger); err != nil {
} else if err := updateconfig.Update(osFileGetter{root: c.releaseRepoPath}, c.cmclient, cm.Name, "", data, nil, c.logger); err != nil {
return err
}
return nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/rehearse/jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -617,13 +617,13 @@ func (e *Executor) submitRehearsals() ([]*pjapi.ProwJob, error) {
}

func (e *Executor) submitPresubmit(job *prowconfig.Presubmit) (*pjapi.ProwJob, error) {
prowJob := pjutil.NewProwJob(pjutil.PresubmitSpec(*job, *e.refs), job.Labels)
prowJob := pjutil.NewProwJob(pjutil.PresubmitSpec(*job, *e.refs), job.Labels, job.Annotations)
e.loggers.Job.WithFields(pjutil.ProwJobFields(&prowJob)).Info("Submitting a new prowjob.")
return e.pjclient.Create(&prowJob)
}

func (e *Executor) submitPeriodic(job prowconfig.Periodic) (*pjapi.ProwJob, error) {
prowJob := pjutil.NewProwJob(pjutil.PeriodicSpec(job), job.Labels)
prowJob := pjutil.NewProwJob(pjutil.PeriodicSpec(job), job.Labels, job.Annotations)
e.loggers.Job.WithFields(pjutil.ProwJobFields(&prowJob)).Info("Submitting a new prowjob.")
return e.pjclient.Create(&prowJob)
}

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

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

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

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

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

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

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

Loading