From 4cc43e33613b1af33ef36ec41c2d5d3eae066bd6 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Tue, 2 Jun 2020 17:32:02 -0700 Subject: [PATCH 1/3] master --- cmd/workflow-controller/main.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/workflow-controller/main.go b/cmd/workflow-controller/main.go index 8ed0a36854aa..97e12c33178e 100644 --- a/cmd/workflow-controller/main.go +++ b/cmd/workflow-controller/main.go @@ -40,6 +40,8 @@ func NewRootCommand() *cobra.Command { glogLevel int // --gloglevel workflowWorkers int // --workflow-workers podWorkers int // --pod-workers + burst int + qps float32 namespaced bool // --namespaced managedNamespace string // --managed-namespace ) @@ -57,8 +59,8 @@ func NewRootCommand() *cobra.Command { if err != nil { return err } - config.Burst = 30 - config.QPS = 20.0 + config.Burst = burst + config.QPS = qps namespace, _, err := clientConfig.Namespace() if err != nil { @@ -98,6 +100,8 @@ func NewRootCommand() *cobra.Command { command.Flags().IntVar(&glogLevel, "gloglevel", 0, "Set the glog logging level") command.Flags().IntVar(&workflowWorkers, "workflow-workers", 32, "Number of workflow workers") command.Flags().IntVar(&podWorkers, "pod-workers", 32, "Number of pod workers") + command.Flags().IntVar(&burst, "burst", 30, "Burst") + command.Flags().Float32Var(&qps, "qps", 20.0, "Queries per second") command.Flags().BoolVar(&namespaced, "namespaced", false, "run workflow-controller as namespaced mode") command.Flags().StringVar(&managedNamespace, "managed-namespace", "", "namespace that workflow-controller watches, default to the installation namespace") return &command From cec25e8612676e5dc0f0b27297bd927aa026a3a9 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Wed, 3 Jun 2020 10:00:41 -0700 Subject: [PATCH 2/3] fix(controller): Maybe bug with nil wf.wfSpec. Fixes #3121 --- workflow/controller/operator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go index 4d5b58e10620..fa9f421fc947 100644 --- a/workflow/controller/operator.go +++ b/workflow/controller/operator.go @@ -119,6 +119,7 @@ func newWorkflowOperationCtx(wf *wfv1.Workflow, wfc *WorkflowController) *wfOper woc := wfOperationCtx{ wf: wf.DeepCopyObject().(*wfv1.Workflow), orig: wf, + wfSpec: &wf.Spec, updated: false, log: log.WithFields(log.Fields{ "workflow": wf.ObjectMeta.Name, @@ -2683,7 +2684,6 @@ func (woc *wfOperationCtx) loadExecutionSpec() (wfv1.TemplateReferenceHolder, wf executionParameters := woc.wf.Spec.Arguments - woc.wfSpec = &woc.wf.Spec if woc.wf.Spec.WorkflowTemplateRef == nil { tmplRef := &wfv1.WorkflowStep{Template: woc.wfSpec.Entrypoint} return tmplRef, executionParameters, nil From 32ce404eb80cdcdecd455ab45a9dc11cb09617a5 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Wed, 3 Jun 2020 10:08:33 -0700 Subject: [PATCH 3/3] fix-3158 --- cmd/workflow-controller/main.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cmd/workflow-controller/main.go b/cmd/workflow-controller/main.go index 97e12c33178e..8ed0a36854aa 100644 --- a/cmd/workflow-controller/main.go +++ b/cmd/workflow-controller/main.go @@ -40,8 +40,6 @@ func NewRootCommand() *cobra.Command { glogLevel int // --gloglevel workflowWorkers int // --workflow-workers podWorkers int // --pod-workers - burst int - qps float32 namespaced bool // --namespaced managedNamespace string // --managed-namespace ) @@ -59,8 +57,8 @@ func NewRootCommand() *cobra.Command { if err != nil { return err } - config.Burst = burst - config.QPS = qps + config.Burst = 30 + config.QPS = 20.0 namespace, _, err := clientConfig.Namespace() if err != nil { @@ -100,8 +98,6 @@ func NewRootCommand() *cobra.Command { command.Flags().IntVar(&glogLevel, "gloglevel", 0, "Set the glog logging level") command.Flags().IntVar(&workflowWorkers, "workflow-workers", 32, "Number of workflow workers") command.Flags().IntVar(&podWorkers, "pod-workers", 32, "Number of pod workers") - command.Flags().IntVar(&burst, "burst", 30, "Burst") - command.Flags().Float32Var(&qps, "qps", 20.0, "Queries per second") command.Flags().BoolVar(&namespaced, "namespaced", false, "run workflow-controller as namespaced mode") command.Flags().StringVar(&managedNamespace, "managed-namespace", "", "namespace that workflow-controller watches, default to the installation namespace") return &command