Skip to content

Commit 7f9500a

Browse files
author
OpenShift Bot
authored
Merge pull request #10062 from fabianofranz/issues_9992
Merged by openshift-bot
2 parents 5835141 + 1a9766b commit 7f9500a

File tree

1 file changed

+78
-41
lines changed

1 file changed

+78
-41
lines changed

‎pkg/cmd/util/clientcmd/factory.go

+78-41
Original file line numberDiff line numberDiff line change
@@ -266,31 +266,41 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
266266
}
267267
kScalerFunc := w.Factory.Scaler
268268
w.Scaler = func(mapping *meta.RESTMapping) (kubectl.Scaler, error) {
269-
oc, kc, err := w.Clients()
270-
if err != nil {
271-
return nil, err
272-
}
273-
274269
if mapping.GroupVersionKind.GroupKind() == deployapi.Kind("DeploymentConfig") {
270+
oc, kc, err := w.Clients()
271+
if err != nil {
272+
return nil, err
273+
}
275274
return deploycmd.NewDeploymentConfigScaler(oc, kc), nil
276275
}
277276
return kScalerFunc(mapping)
278277
}
279278
kReaperFunc := w.Factory.Reaper
280279
w.Reaper = func(mapping *meta.RESTMapping) (kubectl.Reaper, error) {
281-
oc, kc, err := w.Clients()
282-
if err != nil {
283-
return nil, err
284-
}
285-
286280
switch mapping.GroupVersionKind.GroupKind() {
287281
case deployapi.Kind("DeploymentConfig"):
282+
oc, kc, err := w.Clients()
283+
if err != nil {
284+
return nil, err
285+
}
288286
return deploycmd.NewDeploymentConfigReaper(oc, kc), nil
289287
case authorizationapi.Kind("Role"):
288+
oc, _, err := w.Clients()
289+
if err != nil {
290+
return nil, err
291+
}
290292
return authorizationreaper.NewRoleReaper(oc, oc), nil
291293
case authorizationapi.Kind("ClusterRole"):
294+
oc, _, err := w.Clients()
295+
if err != nil {
296+
return nil, err
297+
}
292298
return authorizationreaper.NewClusterRoleReaper(oc, oc, oc), nil
293299
case userapi.Kind("User"):
300+
oc, kc, err := w.Clients()
301+
if err != nil {
302+
return nil, err
303+
}
294304
return authenticationreaper.NewUserReaper(
295305
client.UsersInterface(oc),
296306
client.GroupsInterface(oc),
@@ -299,13 +309,21 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
299309
kclient.SecurityContextConstraintsInterface(kc),
300310
), nil
301311
case userapi.Kind("Group"):
312+
oc, kc, err := w.Clients()
313+
if err != nil {
314+
return nil, err
315+
}
302316
return authenticationreaper.NewGroupReaper(
303317
client.GroupsInterface(oc),
304318
client.ClusterRoleBindingsInterface(oc),
305319
client.RoleBindingsNamespacer(oc),
306320
kclient.SecurityContextConstraintsInterface(kc),
307321
), nil
308322
case buildapi.Kind("BuildConfig"):
323+
oc, _, err := w.Clients()
324+
if err != nil {
325+
return nil, err
326+
}
309327
return buildreaper.NewBuildConfigReaper(oc), nil
310328
}
311329
return kReaperFunc(mapping)
@@ -344,17 +362,16 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
344362
}
345363
kLogsForObjectFunc := w.Factory.LogsForObject
346364
w.LogsForObject = func(object, options runtime.Object) (*restclient.Request, error) {
347-
oc, _, err := w.Clients()
348-
if err != nil {
349-
return nil, err
350-
}
351-
352365
switch t := object.(type) {
353366
case *deployapi.DeploymentConfig:
354367
dopts, ok := options.(*deployapi.DeploymentLogOptions)
355368
if !ok {
356369
return nil, errors.New("provided options object is not a DeploymentLogOptions")
357370
}
371+
oc, _, err := w.Clients()
372+
if err != nil {
373+
return nil, err
374+
}
358375
return oc.DeploymentLogs(t.Namespace).Get(t.Name, *dopts), nil
359376
case *buildapi.Build:
360377
bopts, ok := options.(*buildapi.BuildLogOptions)
@@ -364,12 +381,20 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
364381
if bopts.Version != nil {
365382
return nil, errors.New("cannot specify a version and a build")
366383
}
384+
oc, _, err := w.Clients()
385+
if err != nil {
386+
return nil, err
387+
}
367388
return oc.BuildLogs(t.Namespace).Get(t.Name, *bopts), nil
368389
case *buildapi.BuildConfig:
369390
bopts, ok := options.(*buildapi.BuildLogOptions)
370391
if !ok {
371392
return nil, errors.New("provided options object is not a BuildLogOptions")
372393
}
394+
oc, _, err := w.Clients()
395+
if err != nil {
396+
return nil, err
397+
}
373398
builds, err := oc.Builds(t.Namespace).List(api.ListOptions{})
374399
if err != nil {
375400
return nil, err
@@ -474,18 +499,17 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
474499
w.PrintObjectSpecificMessage = func(obj runtime.Object, out io.Writer) {}
475500
kPauseObjectFunc := w.Factory.PauseObject
476501
w.Factory.PauseObject = func(object runtime.Object) (bool, error) {
477-
oc, _, err := w.Clients()
478-
if err != nil {
479-
return false, err
480-
}
481-
482502
switch t := object.(type) {
483503
case *deployapi.DeploymentConfig:
484504
if t.Spec.Paused {
485505
return true, nil
486506
}
487507
t.Spec.Paused = true
488-
_, err := oc.DeploymentConfigs(t.Namespace).Update(t)
508+
oc, _, err := w.Clients()
509+
if err != nil {
510+
return false, err
511+
}
512+
_, err = oc.DeploymentConfigs(t.Namespace).Update(t)
489513
// TODO: Pause the deployer containers.
490514
return false, err
491515
default:
@@ -494,18 +518,17 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
494518
}
495519
kResumeObjectFunc := w.Factory.ResumeObject
496520
w.Factory.ResumeObject = func(object runtime.Object) (bool, error) {
497-
oc, _, err := w.Clients()
498-
if err != nil {
499-
return false, err
500-
}
501-
502521
switch t := object.(type) {
503522
case *deployapi.DeploymentConfig:
504523
if !t.Spec.Paused {
505524
return true, nil
506525
}
507526
t.Spec.Paused = false
508-
_, err := oc.DeploymentConfigs(t.Namespace).Update(t)
527+
oc, _, err := w.Clients()
528+
if err != nil {
529+
return false, err
530+
}
531+
_, err = oc.DeploymentConfigs(t.Namespace).Update(t)
509532
// TODO: Resume the deployer containers.
510533
return false, err
511534
default:
@@ -514,26 +537,24 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {
514537
}
515538
kHistoryViewerFunc := w.Factory.HistoryViewer
516539
w.Factory.HistoryViewer = func(mapping *meta.RESTMapping) (kubectl.HistoryViewer, error) {
517-
oc, kc, err := w.Clients()
518-
if err != nil {
519-
return nil, err
520-
}
521-
522540
switch mapping.GroupVersionKind.GroupKind() {
523541
case deployapi.Kind("DeploymentConfig"):
542+
oc, kc, err := w.Clients()
543+
if err != nil {
544+
return nil, err
545+
}
524546
return deploycmd.NewDeploymentConfigHistoryViewer(oc, kc), nil
525547
}
526548
return kHistoryViewerFunc(mapping)
527549
}
528550
kRollbackerFunc := w.Factory.Rollbacker
529551
w.Factory.Rollbacker = func(mapping *meta.RESTMapping) (kubectl.Rollbacker, error) {
530-
oc, _, err := w.Clients()
531-
if err != nil {
532-
return nil, err
533-
}
534-
535552
switch mapping.GroupVersionKind.GroupKind() {
536553
case deployapi.Kind("DeploymentConfig"):
554+
oc, _, err := w.Clients()
555+
if err != nil {
556+
return nil, err
557+
}
537558
return deploycmd.NewDeploymentConfigRollbacker(oc), nil
538559
}
539560
return kRollbackerFunc(mapping)
@@ -705,10 +726,6 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string
705726
if err != nil {
706727
return "", err
707728
}
708-
oc, kc, err := f.Clients()
709-
if err != nil {
710-
return "", err
711-
}
712729
mapper, _ := f.Object(false)
713730
resourceType, name, err := util.ResolveResource(api.Resource("pods"), resource, mapper)
714731
if err != nil {
@@ -719,6 +736,10 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string
719736
case api.Resource("pods"):
720737
return name, nil
721738
case api.Resource("replicationcontrollers"):
739+
kc, err := f.Client()
740+
if err != nil {
741+
return "", err
742+
}
722743
rc, err := kc.ReplicationControllers(namespace).Get(name)
723744
if err != nil {
724745
return "", err
@@ -730,6 +751,10 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string
730751
}
731752
return pod.Name, nil
732753
case deployapi.Resource("deploymentconfigs"):
754+
oc, kc, err := f.Clients()
755+
if err != nil {
756+
return "", err
757+
}
733758
dc, err := oc.DeploymentConfigs(namespace).Get(name)
734759
if err != nil {
735760
return "", err
@@ -741,6 +766,10 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string
741766
}
742767
return pod.Name, nil
743768
case extensions.Resource("daemonsets"):
769+
kc, err := f.Client()
770+
if err != nil {
771+
return "", err
772+
}
744773
ds, err := kc.Extensions().DaemonSets(namespace).Get(name)
745774
if err != nil {
746775
return "", err
@@ -755,12 +784,20 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string
755784
}
756785
return pod.Name, nil
757786
case extensions.Resource("jobs"):
787+
kc, err := f.Client()
788+
if err != nil {
789+
return "", err
790+
}
758791
job, err := kc.Extensions().Jobs(namespace).Get(name)
759792
if err != nil {
760793
return "", err
761794
}
762795
return podNameForJob(job, kc, timeout, sortBy)
763796
case batch.Resource("jobs"):
797+
kc, err := f.Client()
798+
if err != nil {
799+
return "", err
800+
}
764801
job, err := kc.Batch().Jobs(namespace).Get(name)
765802
if err != nil {
766803
return "", err

0 commit comments

Comments
 (0)