Fix workflow template in namespaced controller (argoproj#1580)

* Add workflow template permissions to namespaced deployment manifests * Use filtered shared informer factory for namespaced deployment
vincentaudoire · Sep 5, 2019 · 89e959e · 89e959e
1 parent cd04ab8
commit 89e959e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -82,6 +82,15 @@ rules:
  - update
  - patch
  - delete
+- apiGroups:
+ - argoproj.io
+ resources:
+ - workflowtemplates
+ - workflowtemplates/finalizers
+ verbs:
+ - get
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:

diff --git a/manifests/namespace-install/workflow-controller-rbac/workflow-controller-role.yaml b/manifests/namespace-install/workflow-controller-rbac/workflow-controller-role.yaml
@@ -43,6 +43,15 @@ rules:
  - update
  - patch
  - delete
+- apiGroups:
+ - argoproj.io
+ resources:
+ - workflowtemplates
+ - workflowtemplates/finalizers
+ verbs:
+ - get
+ - list
+ - watch
 - apiGroups:
  - ""
  resources:

diff --git a/workflow/controller/controller.go b/workflow/controller/controller.go
@@ -148,9 +148,7 @@ func (wfc *WorkflowController) Run(ctx context.Context, wfWorkers, podWorkers in
  }
 
  wfc.wfInformer = util.NewWorkflowInformer(wfc.restConfig, wfc.Config.Namespace, workflowResyncPeriod, wfc.tweakWorkflowlist)
-
- informerFactory := wfextv.NewSharedInformerFactory(wfc.wfclientset, workflowTemplateResyncPeriod)
- wfc.wftmplInformer = informerFactory.Argoproj().V1alpha1().WorkflowTemplates()
+ wfc.wftmplInformer = wfc.newWorkflowTemplateInformer()
 
  wfc.addWorkflowInformerHandler()
  wfc.podInformer = wfc.newPodInformer()
@@ -508,6 +506,16 @@ func (wfc *WorkflowController) newPodInformer() cache.SharedIndexInformer {
  return informer
 }
 
+func (wfc *WorkflowController) newWorkflowTemplateInformer() wfextvv1alpha1.WorkflowTemplateInformer {
+ var informerFactory wfextv.SharedInformerFactory
+ if wfc.Config.Namespace != "" {
+ informerFactory = wfextv.NewFilteredSharedInformerFactory(wfc.wfclientset, workflowTemplateResyncPeriod, wfc.Config.Namespace, func(opts *metav1.ListOptions) {})
+ } else {
+ informerFactory = wfextv.NewSharedInformerFactory(wfc.wfclientset, workflowTemplateResyncPeriod)
+ }
+ return informerFactory.Argoproj().V1alpha1().WorkflowTemplates()
+}
+
 func (wfc *WorkflowController) createPersistenceContext() (*sqldb.WorkflowDBContext, error) {
 
  var wfDBCtx sqldb.WorkflowDBContext