Skip to content

Commit 294157d

Browse files
kibbles-n-bytespmorie
kibbles-n-bytes
authored and
pmorie
committed
remove setServiceBindingCondition dependency on controller (#1441)
1 parent 118a0f7 commit 294157d

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎pkg/controller/controller_binding.go

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func (c *controller) setAndUpdateOrphanMitigation(binding *v1beta1.ServiceBindin
133133
toUpdate.Status.OperationStartTime = nil
134134
glog.V(5).Info(s)
135135

136-
c.setServiceBindingCondition(
136+
setServiceBindingCondition(
137137
toUpdate,
138138
v1beta1.ServiceBindingConditionReady,
139139
v1beta1.ConditionFalse,
@@ -197,7 +197,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
197197
typeSB, binding.Namespace, binding.Name, s, err,
198198
)
199199
c.recorder.Event(binding, corev1.EventTypeWarning, errorNonexistentServiceInstanceReason, s)
200-
c.setServiceBindingCondition(
200+
setServiceBindingCondition(
201201
toUpdate,
202202
v1beta1.ServiceBindingConditionReady,
203203
v1beta1.ConditionFalse,
@@ -217,7 +217,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
217217
)
218218
glog.Info(s)
219219
c.recorder.Event(binding, corev1.EventTypeWarning, errorWithOngoingAsyncOperation, s)
220-
c.setServiceBindingCondition(
220+
setServiceBindingCondition(
221221
toUpdate,
222222
v1beta1.ServiceBindingConditionReady,
223223
v1beta1.ConditionFalse,
@@ -250,7 +250,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
250250
typeSB, binding.Namespace, binding.Name, s,
251251
)
252252
c.recorder.Event(binding, corev1.EventTypeWarning, errorNonbindableClusterServiceClassReason, s)
253-
c.setServiceBindingCondition(
253+
setServiceBindingCondition(
254254
toUpdate,
255255
v1beta1.ServiceBindingConditionReady,
256256
v1beta1.ConditionFalse,
@@ -277,7 +277,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
277277
typeSB, binding.Namespace, binding.Name, s,
278278
)
279279
c.recorder.Eventf(binding, corev1.EventTypeWarning, errorFindingNamespaceServiceInstanceReason, s)
280-
c.setServiceBindingCondition(
280+
setServiceBindingCondition(
281281
toUpdate,
282282
v1beta1.ServiceBindingConditionReady,
283283
v1beta1.ConditionFalse,
@@ -300,7 +300,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
300300
typeSB, binding.Namespace, binding.Name, s,
301301
)
302302
c.recorder.Eventf(binding, corev1.EventTypeWarning, errorServiceInstanceNotReadyReason, s)
303-
c.setServiceBindingCondition(
303+
setServiceBindingCondition(
304304
toUpdate,
305305
v1beta1.ServiceBindingConditionReady,
306306
v1beta1.ConditionFalse,
@@ -331,7 +331,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
331331
typeSB, binding.Namespace, binding.Name, s,
332332
)
333333
c.recorder.Event(binding, corev1.EventTypeWarning, errorWithParameters, s)
334-
c.setServiceBindingCondition(
334+
setServiceBindingCondition(
335335
toUpdate,
336336
v1beta1.ServiceBindingConditionReady,
337337
v1beta1.ConditionFalse,
@@ -352,7 +352,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
352352
typeSB, binding.Namespace, binding.Name, s,
353353
)
354354
c.recorder.Eventf(binding, corev1.EventTypeWarning, errorWithParameters, s)
355-
c.setServiceBindingCondition(
355+
setServiceBindingCondition(
356356
toUpdate,
357357
v1beta1.ServiceBindingConditionReady,
358358
v1beta1.ConditionFalse,
@@ -372,7 +372,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
372372
typeSB, binding.Namespace, binding.Name, s,
373373
)
374374
c.recorder.Eventf(binding, corev1.EventTypeWarning, errorWithParameters, s)
375-
c.setServiceBindingCondition(
375+
setServiceBindingCondition(
376376
toUpdate,
377377
v1beta1.ServiceBindingConditionReady,
378378
v1beta1.ConditionFalse,
@@ -415,7 +415,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
415415
typeSB, binding.Namespace, binding.Name, s,
416416
)
417417
c.recorder.Event(binding, corev1.EventTypeWarning, errorWithOriginatingIdentity, s)
418-
c.setServiceBindingCondition(
418+
setServiceBindingCondition(
419419
toUpdate,
420420
v1beta1.ServiceBindingConditionReady,
421421
v1beta1.ConditionFalse,
@@ -442,7 +442,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
442442
response, err := brokerClient.Bind(request)
443443
// orphan mitigation: looking for timeout
444444
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
445-
c.setServiceBindingCondition(
445+
setServiceBindingCondition(
446446
toUpdate,
447447
v1beta1.ServiceBindingConditionFailed,
448448
v1beta1.ConditionTrue,
@@ -456,7 +456,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
456456
if httpErr.StatusCode > 200 && httpErr.StatusCode < 300 ||
457457
httpErr.StatusCode == http.StatusRequestTimeout ||
458458
httpErr.StatusCode >= 500 && httpErr.StatusCode < 600 {
459-
c.setServiceBindingCondition(
459+
setServiceBindingCondition(
460460
toUpdate,
461461
v1beta1.ServiceBindingConditionFailed,
462462
v1beta1.ConditionTrue,
@@ -474,14 +474,14 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
474474
)
475475
c.recorder.Event(binding, corev1.EventTypeWarning, errorBindCallReason, s)
476476

477-
c.setServiceBindingCondition(
477+
setServiceBindingCondition(
478478
toUpdate,
479479
v1beta1.ServiceBindingConditionFailed,
480480
v1beta1.ConditionTrue,
481481
"ServiceBindingReturnedFailure",
482482
s,
483483
)
484-
c.setServiceBindingCondition(
484+
setServiceBindingCondition(
485485
toUpdate,
486486
v1beta1.ServiceBindingConditionReady,
487487
v1beta1.ConditionFalse,
@@ -503,7 +503,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
503503
typeSB, binding.Name, binding.Namespace, s,
504504
)
505505
c.recorder.Event(binding, corev1.EventTypeWarning, errorBindCallReason, s)
506-
c.setServiceBindingCondition(
506+
setServiceBindingCondition(
507507
toUpdate,
508508
v1beta1.ServiceBindingConditionReady,
509509
v1beta1.ConditionFalse,
@@ -517,7 +517,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
517517
typeSB, binding.Namespace, binding.Name, s,
518518
)
519519
c.recorder.Event(binding, corev1.EventTypeWarning, errorReconciliationRetryTimeoutReason, s)
520-
c.setServiceBindingCondition(toUpdate,
520+
setServiceBindingCondition(toUpdate,
521521
v1beta1.ServiceBindingConditionFailed,
522522
v1beta1.ConditionTrue,
523523
errorReconciliationRetryTimeoutReason,
@@ -553,7 +553,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
553553
typeSB, binding.Namespace, binding.Name, s,
554554
)
555555
c.recorder.Event(binding, corev1.EventTypeWarning, errorInjectingBindResultReason, s)
556-
c.setServiceBindingCondition(
556+
setServiceBindingCondition(
557557
toUpdate,
558558
v1beta1.ServiceBindingConditionReady,
559559
v1beta1.ConditionFalse,
@@ -568,7 +568,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
568568
)
569569
glog.Info(s)
570570
c.recorder.Event(binding, corev1.EventTypeWarning, errorReconciliationRetryTimeoutReason, s)
571-
c.setServiceBindingCondition(toUpdate,
571+
setServiceBindingCondition(toUpdate,
572572
v1beta1.ServiceBindingConditionFailed,
573573
v1beta1.ConditionTrue,
574574
errorReconciliationRetryTimeoutReason,
@@ -586,7 +586,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
586586

587587
c.clearServiceBindingCurrentOperation(toUpdate)
588588

589-
c.setServiceBindingCondition(
589+
setServiceBindingCondition(
590590
toUpdate,
591591
v1beta1.ServiceBindingConditionReady,
592592
v1beta1.ConditionTrue,
@@ -620,7 +620,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
620620
typeSB, binding.Namespace, binding.Name, s,
621621
)
622622
c.recorder.Eventf(binding, corev1.EventTypeWarning, errorEjectingBindReason, "%v %v", errorEjectingBindMessage, s)
623-
c.setServiceBindingCondition(
623+
setServiceBindingCondition(
624624
toUpdate,
625625
v1beta1.ServiceBindingConditionReady,
626626
v1beta1.ConditionUnknown,
@@ -649,7 +649,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
649649
typeSB, binding.Namespace, binding.Name, s,
650650
)
651651
c.recorder.Event(binding, corev1.EventTypeWarning, errorWithOriginatingIdentity, s)
652-
c.setServiceBindingCondition(
652+
setServiceBindingCondition(
653653
toUpdate,
654654
v1beta1.ServiceBindingConditionReady,
655655
v1beta1.ConditionFalse,
@@ -688,14 +688,14 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
688688
typeSB, binding.Namespace, binding.Name, s,
689689
)
690690
c.recorder.Event(binding, corev1.EventTypeWarning, errorUnbindCallReason, s)
691-
c.setServiceBindingCondition(
691+
setServiceBindingCondition(
692692
toUpdate,
693693
v1beta1.ServiceBindingConditionReady,
694694
v1beta1.ConditionUnknown,
695695
errorUnbindCallReason,
696696
"Unbind call failed. "+s)
697697
if !toUpdate.Status.OrphanMitigationInProgress {
698-
c.setServiceBindingCondition(
698+
setServiceBindingCondition(
699699
toUpdate,
700700
v1beta1.ServiceBindingConditionFailed,
701701
v1beta1.ConditionTrue,
@@ -717,7 +717,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
717717
typeSB, binding.Namespace, binding.Name, s,
718718
)
719719
c.recorder.Event(binding, corev1.EventTypeWarning, errorUnbindCallReason, s)
720-
c.setServiceBindingCondition(
720+
setServiceBindingCondition(
721721
toUpdate,
722722
v1beta1.ServiceBindingConditionReady,
723723
v1beta1.ConditionUnknown,
@@ -731,7 +731,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
731731
typeSB, binding.Namespace, binding.Name, s,
732732
)
733733
c.recorder.Event(binding, corev1.EventTypeWarning, errorReconciliationRetryTimeoutReason, s)
734-
c.setServiceBindingCondition(toUpdate,
734+
setServiceBindingCondition(toUpdate,
735735
v1beta1.ServiceBindingConditionFailed,
736736
v1beta1.ConditionTrue,
737737
errorReconciliationRetryTimeoutReason,
@@ -750,7 +750,7 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
750750
typeSB, binding.Namespace, binding.Name, s,
751751
)
752752
c.recorder.Event(binding, corev1.EventTypeWarning, errorReconciliationRetryTimeoutReason, s)
753-
c.setServiceBindingCondition(toUpdate,
753+
setServiceBindingCondition(toUpdate,
754754
v1beta1.ServiceBindingConditionFailed,
755755
v1beta1.ConditionTrue,
756756
errorReconciliationRetryTimeoutReason,
@@ -774,14 +774,14 @@ func (c *controller) reconcileServiceBinding(binding *v1beta1.ServiceBinding) er
774774
`%s "%s/%s": Orphan mitigation successful`,
775775
typeSB, binding.Namespace, binding.Name,
776776
)
777-
c.setServiceBindingCondition(toUpdate,
777+
setServiceBindingCondition(toUpdate,
778778
v1beta1.ServiceBindingConditionReady,
779779
v1beta1.ConditionFalse,
780780
successOrphanMitigationReason,
781781
s)
782782
} else {
783783
s := "The binding was deleted successfully"
784-
c.setServiceBindingCondition(
784+
setServiceBindingCondition(
785785
toUpdate,
786786
v1beta1.ServiceBindingConditionReady,
787787
v1beta1.ConditionFalse,
@@ -913,7 +913,7 @@ func (c *controller) ejectServiceBinding(binding *v1beta1.ServiceBinding) error
913913
//
914914
// Note: objects coming from informers should never be mutated; always pass a
915915
// deep copy as the binding parameter.
916-
func (c *controller) setServiceBindingCondition(toUpdate *v1beta1.ServiceBinding,
916+
func setServiceBindingCondition(toUpdate *v1beta1.ServiceBinding,
917917
conditionType v1beta1.ServiceBindingConditionType,
918918
status v1beta1.ConditionStatus,
919919
reason, message string) {
@@ -1005,7 +1005,7 @@ func (c *controller) updateServiceBindingCondition(
10051005
return err
10061006
}
10071007

1008-
c.setServiceBindingCondition(toUpdate, conditionType, status, reason, message)
1008+
setServiceBindingCondition(toUpdate, conditionType, status, reason, message)
10091009

10101010
glog.V(4).Infof(
10111011
`%s "%s/%s": Updating %v condition to %v (Reason: %q, Message: %q)`,
@@ -1056,7 +1056,7 @@ func (c *controller) recordStartOfServiceBindingOperation(toUpdate *v1beta1.Serv
10561056
reason = unbindingInFlightReason
10571057
message = unbindingInFlightMessage
10581058
}
1059-
c.setServiceBindingCondition(
1059+
setServiceBindingCondition(
10601060
toUpdate,
10611061
v1beta1.ServiceBindingConditionReady,
10621062
v1beta1.ConditionFalse,

0 commit comments

Comments
 (0)