Skip to content

Commit b36f945

Browse files
sdminonneclamoriniere1A
sdminonne
authored and
clamoriniere1A
committed
one client for all generated types (AmadeusITGroup#85)
1 parent 7bdf9ab commit b36f945

File tree

8 files changed

+94
-102
lines changed

8 files changed

+94
-102
lines changed

‎app/workflow-controller.go

+10-18
Original file line numberDiff line numberDiff line change
@@ -102,29 +102,21 @@ func NewWorkflowControllerApp(c *Config) *WorkflowController {
102102
}
103103
}
104104

105-
workflowClient, err := wclient.NewWorkflowClient(kubeConfig)
105+
client, err := wclient.NewWorkflowClient(kubeConfig)
106106
if err != nil {
107-
glog.Fatalf("Unable to initialize a Workflow client:%v", err)
107+
glog.Fatalf("Unable to initialize a client:%v", err)
108108
}
109109

110110
kubeInformerFactory := kubeinformers.NewSharedInformerFactory(kubeClient, time.Second*30)
111111

112-
workflowInformerFactory := winformers.NewSharedInformerFactory(workflowClient, time.Second*30)
113-
workflowCtrl := controller.NewWorkflowController(workflowClient, kubeClient, kubeInformerFactory, workflowInformerFactory)
112+
workflowInformerFactory := winformers.NewSharedInformerFactory(client, time.Second*30)
113+
workflowCtrl := controller.NewWorkflowController(client, kubeClient, kubeInformerFactory, workflowInformerFactory)
114114

115-
cronWorkflowClient, err := wclient.NewCronWorkflowClient(kubeConfig)
116-
if err != nil {
117-
glog.Fatalf("Unable to initialize CronWorkflow client: %v", err)
118-
}
119-
cronWorkflowInformerFactory := winformers.NewSharedInformerFactory(cronWorkflowClient, time.Second*30)
120-
cronWorkflowCtrl := controller.NewCronWorkflowController(cronWorkflowClient, kubeClient)
115+
cronWorkflowInformerFactory := winformers.NewSharedInformerFactory(client, time.Second*30)
116+
cronWorkflowCtrl := controller.NewCronWorkflowController(client, kubeClient)
121117

122-
daemonSetJobClient, err := wclient.NewDaemonSetJobClient(kubeConfig)
123-
if err != nil {
124-
glog.Fatalf("Unable to initialize DaemonSetJob client: %v", err)
125-
}
126-
daemonSetJobInformerFactory := winformers.NewSharedInformerFactory(daemonSetJobClient, time.Second*30)
127-
daemonSetJobCtrl := controller.NewDaemonSetJobController(daemonSetJobClient, kubeClient, kubeInformerFactory, daemonSetJobInformerFactory)
118+
daemonSetJobInformerFactory := winformers.NewSharedInformerFactory(client, time.Second*30)
119+
daemonSetJobCtrl := controller.NewDaemonSetJobController(client, kubeClient, kubeInformerFactory, daemonSetJobInformerFactory)
128120

129121
// configure readiness and liveness probes
130122
health := healthcheck.NewHandler()
@@ -136,14 +128,14 @@ func NewWorkflowControllerApp(c *Config) *WorkflowController {
136128
kubeInformerFactory: kubeInformerFactory,
137129
workflowInformerFactory: workflowInformerFactory,
138130
workflowController: workflowCtrl,
139-
workflowGC: garbagecollector.NewGarbageCollector(workflowClient, kubeClient, workflowInformerFactory),
131+
workflowGC: garbagecollector.NewGarbageCollector(client, kubeClient, workflowInformerFactory),
140132

141133
cronWorkflowInfomerFactory: cronWorkflowInformerFactory,
142134
cronWorkflowController: cronWorkflowCtrl,
143135

144136
daemonSetJobInfomerFactory: daemonSetJobInformerFactory,
145137
daemonSetJobController: daemonSetJobCtrl,
146-
daemonSetJobGC: garbagecollector.NewDaemonSetJobGarbageCollector(daemonSetJobClient, kubeClient, daemonSetJobInformerFactory),
138+
daemonSetJobGC: garbagecollector.NewDaemonSetJobGarbageCollector(client, kubeClient, daemonSetJobInformerFactory),
147139

148140
httpServer: &http.Server{Addr: c.ListenHTTPAddr, Handler: health},
149141
}

‎pkg/controller/cronworkflow.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ type CronWorkflowControllerConfig struct {
3636

3737
// CronWorkflowController represents the Workflow controller
3838
type CronWorkflowController struct {
39-
CronWorkflowClient wclientset.Interface
40-
KubeClient clientset.Interface
41-
queue workqueue.RateLimitingInterface // Workflows to be synced
39+
Client wclientset.Interface
40+
KubeClient clientset.Interface
41+
queue workqueue.RateLimitingInterface // Workflows to be synced
4242

4343
CronWorkflowLister cwlisters.CronWorkflowLister
4444
CronWorkflowSynced cache.InformerSynced
@@ -55,16 +55,16 @@ type CronWorkflowController struct {
5555

5656
// NewCronWorkflowController creates and initializes the CronWorkflowController instance
5757
func NewCronWorkflowController(
58-
cronWorkflowClient wclientset.Interface,
58+
client wclientset.Interface,
5959
kubeClient clientset.Interface) *CronWorkflowController {
6060

6161
eventBroadcaster := record.NewBroadcaster()
6262
eventBroadcaster.StartLogging(glog.Infof)
6363
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: v1core.New(kubeClient.Core().RESTClient()).Events("")})
6464

6565
wc := &CronWorkflowController{
66-
CronWorkflowClient: cronWorkflowClient,
67-
KubeClient: kubeClient,
66+
Client: client,
67+
KubeClient: kubeClient,
6868

6969
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "cronworkflow"),
7070
config: CronWorkflowControllerConfig{
@@ -251,15 +251,15 @@ func (w *CronWorkflowController) onDeleteCronWorkflow(obj interface{}) {
251251
}
252252

253253
func (w *CronWorkflowController) updateCronWorkflow(cwfl *cwapi.CronWorkflow) error {
254-
if _, err := w.CronWorkflowClient.CronworkflowV1().CronWorkflows(cwfl.Namespace).Update(cwfl); err != nil {
254+
if _, err := w.Client.CronworkflowV1().CronWorkflows(cwfl.Namespace).Update(cwfl); err != nil {
255255
glog.V(6).Infof("Workflow %s/%s updated", cwfl.Namespace, cwfl.Name)
256256
return err
257257
}
258258
return nil
259259
}
260260

261261
func (w *CronWorkflowController) deleteCronWorkflow(namespace, name string) error {
262-
if err := w.CronWorkflowClient.WorkflowV1().Workflows(namespace).Delete(name, nil); err != nil {
262+
if err := w.Client.WorkflowV1().Workflows(namespace).Delete(name, nil); err != nil {
263263
return fmt.Errorf("unable to delete Workflow %s/%s: %v", namespace, name, err)
264264
}
265265

‎pkg/controller/daemonsetjob.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const (
4949

5050
// DaemonSetJobController represents the DaemonSetJob controller
5151
type DaemonSetJobController struct {
52-
DaemonSetJobClient dclientset.Interface
53-
KubeClient clientset.Interface
52+
Client dclientset.Interface
53+
KubeClient clientset.Interface
5454

5555
DaemonSetJobLister dlisters.DaemonSetJobLister
5656
DaemonSetJobSynced cache.InformerSynced
@@ -75,7 +75,7 @@ type DaemonSetJobController struct {
7575

7676
// NewDaemonSetJobController creates and initializes the DaemonSetJobController instance
7777
func NewDaemonSetJobController(
78-
daemonsetjobClient dclientset.Interface,
78+
client dclientset.Interface,
7979
kubeClient clientset.Interface,
8080
kubeInformerFactory kubeinformers.SharedInformerFactory,
8181
deamonsetJobInformerFactory dinformers.SharedInformerFactory) *DaemonSetJobController {
@@ -89,7 +89,7 @@ func NewDaemonSetJobController(
8989
daemonsetjobInformer := deamonsetJobInformerFactory.Daemonsetjob().V1().DaemonSetJobs()
9090

9191
dj := &DaemonSetJobController{
92-
DaemonSetJobClient: daemonsetjobClient,
92+
Client: client,
9393
KubeClient: kubeClient,
9494
DaemonSetJobLister: daemonsetjobInformer.Lister(),
9595
DaemonSetJobSynced: daemonsetjobInformer.Informer().HasSynced,
@@ -479,14 +479,14 @@ func (d *DaemonSetJobController) onDeleteDaemonSetJob(obj interface{}) {
479479
}
480480

481481
func (d *DaemonSetJobController) updateDaemonSetJob(dj *dapi.DaemonSetJob) error {
482-
if _, err := d.DaemonSetJobClient.DaemonsetjobV1().DaemonSetJobs(dj.Namespace).Update(dj); err != nil {
482+
if _, err := d.Client.DaemonsetjobV1().DaemonSetJobs(dj.Namespace).Update(dj); err != nil {
483483
glog.V(6).Infof("DaemonSetJob %s/%s updated", dj.Namespace, dj.Name)
484484
}
485485
return nil
486486
}
487487

488488
func (d *DaemonSetJobController) deleteDaemonSetJob(namespace, name string) error {
489-
if err := d.DaemonSetJobClient.DaemonsetjobV1().DaemonSetJobs(namespace).Delete(name, nil); err != nil {
489+
if err := d.Client.DaemonsetjobV1().DaemonSetJobs(namespace).Delete(name, nil); err != nil {
490490
return fmt.Errorf("unable to delete DaemonSetJob %s/%s: %v", namespace, name, err)
491491
}
492492

‎pkg/controller/workflow.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ const (
4949

5050
// WorkflowController represents the Workflow controller
5151
type WorkflowController struct {
52-
WorkflowClient wclientset.Interface
53-
KubeClient clientset.Interface
52+
Client wclientset.Interface
53+
KubeClient clientset.Interface
5454

5555
WorkflowLister wlisters.WorkflowLister
5656
WorkflowSynced cache.InformerSynced
@@ -72,7 +72,7 @@ type WorkflowController struct {
7272

7373
// NewWorkflowController creates and initializes the WorkflowController instance
7474
func NewWorkflowController(
75-
workflowClient wclientset.Interface,
75+
client wclientset.Interface,
7676
kubeClient clientset.Interface,
7777
kubeInformerFactory kubeinformers.SharedInformerFactory,
7878
workflowInformerFactory winformers.SharedInformerFactory) *WorkflowController {
@@ -85,7 +85,7 @@ func NewWorkflowController(
8585
workflowInformer := workflowInformerFactory.Workflow().V1().Workflows()
8686

8787
wc := &WorkflowController{
88-
WorkflowClient: workflowClient,
88+
Client: client,
8989
KubeClient: kubeClient,
9090
WorkflowLister: workflowInformer.Lister(),
9191
WorkflowSynced: workflowInformer.Informer().HasSynced,
@@ -343,14 +343,14 @@ func (w *WorkflowController) onDeleteWorkflow(obj interface{}) {
343343
}
344344

345345
func (w *WorkflowController) updateWorkflow(wfl *wapi.Workflow) error {
346-
if _, err := w.WorkflowClient.WorkflowV1().Workflows(wfl.Namespace).Update(wfl); err != nil {
346+
if _, err := w.Client.WorkflowV1().Workflows(wfl.Namespace).Update(wfl); err != nil {
347347
glog.V(6).Infof("Workflow %s/%s updated", wfl.Namespace, wfl.Name)
348348
}
349349
return nil
350350
}
351351

352352
func (w *WorkflowController) deleteWorkflow(namespace, name string) error {
353-
if err := w.WorkflowClient.WorkflowV1().Workflows(namespace).Delete(name, nil); err != nil {
353+
if err := w.Client.WorkflowV1().Workflows(namespace).Delete(name, nil); err != nil {
354354
return fmt.Errorf("unable to delete Workflow %s/%s: %v", namespace, name, err)
355355
}
356356

‎test/e2e/daemonsetjobs.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -44,57 +44,57 @@ var _ = Describe("DaemonSetJob CRUD", func() {
4444
})
4545

4646
It("should create then update a daemonsetjob", func() {
47-
workflowClient, kubeClient := framework.BuildAndSetClients()
47+
client, kubeClient := framework.BuildAndSetClients()
4848
ns := api.NamespaceDefault
4949
myDaemonSetJob := framework.NewDaemonSetJob(workflow.GroupName, "v1", "daemonsetjob1", ns, nil)
5050
defer func() {
51-
deleteDaemonSetJob(workflowClient, myDaemonSetJob)
51+
deleteDaemonSetJob(client, myDaemonSetJob)
5252
deleteAllJobsFromDaemonSetJob(kubeClient, myDaemonSetJob)
5353
}()
5454

55-
Eventually(framework.HOCreateDaemonSetJob(workflowClient, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
55+
Eventually(framework.HOCreateDaemonSetJob(client, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
5656

57-
Eventually(framework.HOIsDaemonSetJobStarted(workflowClient, myDaemonSetJob), "40s", "5s").ShouldNot(HaveOccurred())
57+
Eventually(framework.HOIsDaemonSetJobStarted(client, myDaemonSetJob), "40s", "5s").ShouldNot(HaveOccurred())
5858

59-
Eventually(framework.HOUpdateDaemonSetJob(workflowClient, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
59+
Eventually(framework.HOUpdateDaemonSetJob(client, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
6060

6161
Eventually(framework.HOIsDaemonSetJobJobsStarted(kubeClient, myDaemonSetJob), "60s", "5s").ShouldNot(HaveOccurred())
6262
})
6363

6464
It("should run to finish a daemonsetjob", func() {
65-
workflowClient, kubeClient := framework.BuildAndSetClients()
65+
client, kubeClient := framework.BuildAndSetClients()
6666
ns := api.NamespaceDefault
6767
myDaemonSetJob := framework.NewDaemonSetJob(workflow.GroupName, "v1", "daemonsetjob2", ns, nil)
6868
defer func() {
69-
deleteDaemonSetJob(workflowClient, myDaemonSetJob)
69+
deleteDaemonSetJob(client, myDaemonSetJob)
7070
deleteAllJobsFromDaemonSetJob(kubeClient, myDaemonSetJob)
7171
}()
72-
Eventually(framework.HOCreateDaemonSetJob(workflowClient, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
72+
Eventually(framework.HOCreateDaemonSetJob(client, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
7373

74-
Eventually(framework.HOIsDaemonSetJobFinished(workflowClient, myDaemonSetJob), "40s", "5s").ShouldNot(HaveOccurred())
74+
Eventually(framework.HOIsDaemonSetJobFinished(client, myDaemonSetJob), "40s", "5s").ShouldNot(HaveOccurred())
7575

76-
Eventually(framework.HOCheckAllDaemonSetJobJobsFinished(workflowClient, myDaemonSetJob), "60s", "5s").ShouldNot(HaveOccurred())
76+
Eventually(framework.HOCheckAllDaemonSetJobJobsFinished(client, myDaemonSetJob), "60s", "5s").ShouldNot(HaveOccurred())
7777
})
7878

7979
It("should not start job since NodeSelector dont match", func() {
80-
workflowClient, kubeClient := framework.BuildAndSetClients()
80+
client, kubeClient := framework.BuildAndSetClients()
8181
ns := api.NamespaceDefault
8282
myDaemonSetJob := framework.NewDaemonSetJob(workflow.GroupName, "v1", "daemonsetjob3", ns, map[string]string{"sdfdsfsffsd": "fsdfsdfsdfds"})
8383
defer func() {
84-
deleteDaemonSetJob(workflowClient, myDaemonSetJob)
84+
deleteDaemonSetJob(client, myDaemonSetJob)
8585
deleteAllJobsFromDaemonSetJob(kubeClient, myDaemonSetJob)
8686
}()
87-
Eventually(framework.HOCreateDaemonSetJob(workflowClient, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
87+
Eventually(framework.HOCreateDaemonSetJob(client, myDaemonSetJob), "5s", "1s").ShouldNot(HaveOccurred())
8888

89-
Eventually(framework.HOIsDaemonSetJobStarted(workflowClient, myDaemonSetJob), "40s", "5s").ShouldNot(HaveOccurred())
89+
Eventually(framework.HOIsDaemonSetJobStarted(client, myDaemonSetJob), "40s", "5s").ShouldNot(HaveOccurred())
9090

91-
Eventually(framework.HOCheckZeroDaemonSetJobJobsWasCreated(workflowClient, myDaemonSetJob), "10s", "5s").ShouldNot(HaveOccurred())
91+
Eventually(framework.HOCheckZeroDaemonSetJobJobsWasCreated(client, myDaemonSetJob), "10s", "5s").ShouldNot(HaveOccurred())
9292
})
9393

9494
})
9595

96-
func deleteDaemonSetJob(workflowClient versioned.Interface, daemonsetjob *dapi.DaemonSetJob) {
97-
workflowClient.DaemonsetjobV1().DaemonSetJobs(daemonsetjob.Namespace).Delete(daemonsetjob.Name, nil)
96+
func deleteDaemonSetJob(client versioned.Interface, daemonsetjob *dapi.DaemonSetJob) {
97+
client.DaemonsetjobV1().DaemonSetJobs(daemonsetjob.Namespace).Delete(daemonsetjob.Name, nil)
9898
By("DaemonSetJob deleted")
9999
}
100100

‎test/e2e/framework/framework.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (f *Framework) kubeClient() (*clientset.Clientset, error) {
3939
return clientset.NewForConfig(f.KubeConfig)
4040
}
4141

42-
func (f *Framework) workflowClient() (versioned.Interface, error) {
42+
func (f *Framework) client() (versioned.Interface, error) {
4343
c, err := client.NewWorkflowClient(f.KubeConfig)
4444
if err != nil {
4545
return nil, fmt.Errorf("unable to create workflow client:%v", err)

‎test/e2e/framework/workflows_utils.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ func BuildAndSetClients() (versioned.Interface, *clientset.Clientset) {
3737
Ω(err).ShouldNot(HaveOccurred())
3838
Ω(kubeClient).ShouldNot(BeNil())
3939
Logf("Check wether Workflow resource is registered...")
40-
workflowClient, err := f.workflowClient()
40+
client, err := f.client()
4141
Ω(err).ShouldNot(HaveOccurred())
42-
Ω(workflowClient).ShouldNot(BeNil())
43-
return workflowClient, kubeClient
42+
Ω(client).ShouldNot(BeNil())
43+
return client, kubeClient
4444
}
4545

4646
func NewWorkflowStep(name string, dependencies []string) *wapi.WorkflowStep {
@@ -171,7 +171,7 @@ func HOIsWorkflowStarted(workflowClient versioned.Interface, workflow *wapi.Work
171171
return nil
172172
}
173173
Logf("Workflow %s/%s not updated", w.Namespace, w.Name)
174-
return fmt.Errorf("workflow %s not updated", w.Namespace, w.Name)
174+
return fmt.Errorf("workflow %s/%s not updated", w.Namespace, w.Name)
175175
}
176176
}
177177

0 commit comments

Comments
 (0)