Skip to content

Commit 8ad6a31

Browse files
pmoriearschles
pmorie
authored and
arschles
committed
Move controller constants into correct files (openshift#1373)
1 parent 7bd66dd commit 8ad6a31

File tree

3 files changed

+89
-76
lines changed

3 files changed

+89
-76
lines changed

Diff for: ‎pkg/controller/controller_binding.go

+20
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,26 @@ import (
3737
"k8s.io/client-go/tools/cache"
3838
)
3939

40+
const (
41+
errorNonexistentServiceInstanceReason string = "ReferencesNonexistentInstance"
42+
errorBindCallReason string = "BindCallFailed"
43+
errorInjectingBindResultReason string = "ErrorInjectingBindResult"
44+
errorEjectingBindReason string = "ErrorEjectingServiceBinding"
45+
errorEjectingBindMessage string = "Error ejecting binding."
46+
errorUnbindCallReason string = "UnbindCallFailed"
47+
errorNonbindableClusterServiceClassReason string = "ErrorNonbindableServiceClass"
48+
errorServiceInstanceNotReadyReason string = "ErrorInstanceNotReady"
49+
errorServiceBindingOrphanMitigation string = "ServiceBindingNeedsOrphanMitigation"
50+
51+
successInjectedBindResultReason string = "InjectedBindResult"
52+
successInjectedBindResultMessage string = "Injected bind result"
53+
successUnboundReason string = "UnboundSuccessfully"
54+
bindingInFlightReason string = "BindingRequestInFlight"
55+
bindingInFlightMessage string = "Binding request for ServiceBinding in-flight to Broker"
56+
unbindingInFlightReason string = "UnbindingRequestInFlight"
57+
unbindingInFlightMessage string = "Unbind request for ServiceBinding in-flight to Broker"
58+
)
59+
4060
// bindingControllerKind contains the schema.GroupVersionKind for this controller type.
4161
var bindingControllerKind = v1beta1.SchemeGroupVersion.WithKind("ServiceBinding")
4262

Diff for: ‎pkg/controller/controller_broker.go

+27-76
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,33 @@ import (
3333
"k8s.io/client-go/tools/cache"
3434
)
3535

36+
// the Message strings have a terminating period and space so they can
37+
// be easily combined with a follow on specific message.
38+
const (
39+
errorFetchingCatalogReason string = "ErrorFetchingCatalog"
40+
errorFetchingCatalogMessage string = "Error fetching catalog. "
41+
errorSyncingCatalogReason string = "ErrorSyncingCatalog"
42+
errorSyncingCatalogMessage string = "Error syncing catalog from ServiceBroker. "
43+
44+
errorListingClusterServiceClassesReason string = "ErrorListingServiceClasses"
45+
errorListingClusterServiceClassesMessage string = "Error listing service classes."
46+
errorListingClusterServicePlansReason string = "ErrorListingServicePlans"
47+
errorListingClusterServicePlansMessage string = "Error listing service plans."
48+
errorDeletingClusterServiceClassReason string = "ErrorDeletingServiceClass"
49+
errorDeletingClusterServiceClassMessage string = "Error deleting service class."
50+
errorDeletingClusterServicePlanReason string = "ErrorDeletingServicePlan"
51+
errorDeletingClusterServicePlanMessage string = "Error deleting service plan."
52+
errorAuthCredentialsReason string = "ErrorGettingAuthCredentials"
53+
54+
successFetchedCatalogReason string = "FetchedCatalog"
55+
successFetchedCatalogMessage string = "Successfully fetched catalog entries from broker."
56+
successClusterServiceBrokerDeletedReason string = "DeletedSuccessfully"
57+
successClusterServiceBrokerDeletedMessage string = "The broker %v was deleted successfully."
58+
59+
// these reasons are re-used in other controller files.
60+
errorReconciliationRetryTimeoutReason string = "ErrorReconciliationRetryTimeout"
61+
)
62+
3663
func (c *controller) brokerAdd(obj interface{}) {
3764
// DeletionHandlingMetaNamespaceKeyFunc returns a unique key for the resource and
3865
// handles the special case where the resource is of DeletedFinalStateUnknown type, which
@@ -61,82 +88,6 @@ func (c *controller) brokerDelete(obj interface{}) {
6188
glog.V(4).Infof("Received delete event for ClusterServiceBroker %v; no further processing will occur", broker.Name)
6289
}
6390

64-
// the Message strings have a terminating period and space so they can
65-
// be easily combined with a follow on specific message.
66-
const (
67-
errorFetchingCatalogReason string = "ErrorFetchingCatalog"
68-
errorFetchingCatalogMessage string = "Error fetching catalog. "
69-
errorSyncingCatalogReason string = "ErrorSyncingCatalog"
70-
errorSyncingCatalogMessage string = "Error syncing catalog from ServiceBroker. "
71-
errorWithParameters string = "ErrorWithParameters"
72-
errorListingClusterServiceClassesReason string = "ErrorListingServiceClasses"
73-
errorListingClusterServiceClassesMessage string = "Error listing service classes."
74-
errorListingClusterServicePlansReason string = "ErrorListingServicePlans"
75-
errorListingClusterServicePlansMessage string = "Error listing service plans."
76-
errorDeletingClusterServiceClassReason string = "ErrorDeletingServiceClass"
77-
errorDeletingClusterServiceClassMessage string = "Error deleting service class."
78-
errorDeletingClusterServicePlanReason string = "ErrorDeletingServicePlan"
79-
errorDeletingClusterServicePlanMessage string = "Error deleting service plan."
80-
errorNonexistentClusterServiceClassReason string = "ReferencesNonexistentServiceClass"
81-
errorNonexistentClusterServiceClassMessage string = "ReferencesNonexistentServiceClass"
82-
errorNonexistentClusterServicePlanReason string = "ReferencesNonexistentServicePlan"
83-
errorNonexistentClusterServiceBrokerReason string = "ReferencesNonexistentBroker"
84-
errorNonexistentServiceInstanceReason string = "ReferencesNonexistentInstance"
85-
errorAuthCredentialsReason string = "ErrorGettingAuthCredentials"
86-
errorFindingNamespaceServiceInstanceReason string = "ErrorFindingNamespaceForInstance"
87-
errorProvisionCallFailedReason string = "ProvisionCallFailed"
88-
errorErrorCallingProvisionReason string = "ErrorCallingProvision"
89-
errorUpdateInstanceCallFailedReason string = "UpdateInstanceCallFailed"
90-
errorErrorCallingUpdateInstanceReason string = "ErrorCallingUpdateInstance"
91-
errorDeprovisionCalledReason string = "DeprovisionCallFailed"
92-
errorDeprovisionBlockedByCredentialsReason string = "DeprovisionBlockedByExistingCredentials"
93-
errorBindCallReason string = "BindCallFailed"
94-
errorInjectingBindResultReason string = "ErrorInjectingBindResult"
95-
errorEjectingBindReason string = "ErrorEjectingServiceBinding"
96-
errorEjectingBindMessage string = "Error ejecting binding."
97-
errorUnbindCallReason string = "UnbindCallFailed"
98-
errorWithOngoingAsyncOperation string = "ErrorAsyncOperationInProgress"
99-
errorWithOngoingAsyncOperationMessage string = "Another operation for this service instance is in progress. "
100-
errorNonbindableClusterServiceClassReason string = "ErrorNonbindableServiceClass"
101-
errorServiceInstanceNotReadyReason string = "ErrorInstanceNotReady"
102-
errorPollingLastOperationReason string = "ErrorPollingLastOperation"
103-
errorWithOriginatingIdentity string = "Error with Originating Identity"
104-
errorReconciliationRetryTimeoutReason string = "ErrorReconciliationRetryTimeout"
105-
errorServiceBindingOrphanMitigation string = "ServiceBindingNeedsOrphanMitigation"
106-
errorOrphanMigitationReason string = "OrphanMitigationFailed"
107-
108-
successInjectedBindResultReason string = "InjectedBindResult"
109-
successInjectedBindResultMessage string = "Injected bind result"
110-
successDeprovisionReason string = "DeprovisionedSuccessfully"
111-
successDeprovisionMessage string = "The instance was deprovisioned successfully"
112-
successUpdateInstanceReason string = "InstanceUpdatedSuccessfully"
113-
successUpdateInstanceMessage string = "The instance was updated successfully"
114-
successProvisionReason string = "ProvisionedSuccessfully"
115-
successProvisionMessage string = "The instance was provisioned successfully"
116-
successFetchedCatalogReason string = "FetchedCatalog"
117-
successFetchedCatalogMessage string = "Successfully fetched catalog entries from broker."
118-
successClusterServiceBrokerDeletedReason string = "DeletedSuccessfully"
119-
successClusterServiceBrokerDeletedMessage string = "The broker %v was deleted successfully."
120-
successUnboundReason string = "UnboundSuccessfully"
121-
successOrphanMitigationReason string = "OrphanMitigationSuccessful"
122-
asyncProvisioningReason string = "Provisioning"
123-
asyncProvisioningMessage string = "The instance is being provisioned asynchronously"
124-
asyncUpdatingInstanceReason string = "UpdatingInstance"
125-
asyncUpdatingInstanceMessage string = "The instance is being updated asynchronously"
126-
asyncDeprovisioningReason string = "Deprovisioning"
127-
asyncDeprovisioningMessage string = "The instance is being deprovisioned asynchronously"
128-
bindingInFlightReason string = "BindingRequestInFlight"
129-
bindingInFlightMessage string = "Binding request for ServiceBinding in-flight to Broker"
130-
unbindingInFlightReason string = "UnbindingRequestInFlight"
131-
unbindingInFlightMessage string = "Unbind request for ServiceBinding in-flight to Broker"
132-
provisioningInFlightReason string = "ProvisionRequestInFlight"
133-
provisioningInFlightMessage string = "Provision request for ServiceInstance in-flight to Broker"
134-
instanceUpdatingInFlightReason string = "UpdateInstanceRequestInFlight"
135-
instanceUpdatingInFlightMessage string = "Update request for ServiceInstance in-flight to Broker"
136-
deprovisioningInFlightReason string = "DeprovisionRequestInFlight"
137-
deprovisioningInFlightMessage string = "Deprovision request for ServiceInstance in-flight to Broker"
138-
)
139-
14091
// shouldReconcileClusterServiceBroker determines whether a broker should be reconciled; it
14192
// returns true unless the broker has a ready condition with status true and
14293
// the controller's broker relist interval has not elapsed since the broker's

Diff for: ‎pkg/controller/controller_instance.go

+42
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,48 @@ import (
3939
"k8s.io/client-go/tools/cache"
4040
)
4141

42+
const (
43+
successDeprovisionReason string = "DeprovisionedSuccessfully"
44+
successDeprovisionMessage string = "The instance was deprovisioned successfully"
45+
successUpdateInstanceReason string = "InstanceUpdatedSuccessfully"
46+
successUpdateInstanceMessage string = "The instance was updated successfully"
47+
successProvisionReason string = "ProvisionedSuccessfully"
48+
successProvisionMessage string = "The instance was provisioned successfully"
49+
50+
errorWithParameters string = "ErrorWithParameters"
51+
errorProvisionCallFailedReason string = "ProvisionCallFailed"
52+
errorErrorCallingProvisionReason string = "ErrorCallingProvision"
53+
errorUpdateInstanceCallFailedReason string = "UpdateInstanceCallFailed"
54+
errorErrorCallingUpdateInstanceReason string = "ErrorCallingUpdateInstance"
55+
errorDeprovisionCalledReason string = "DeprovisionCallFailed"
56+
errorDeprovisionBlockedByCredentialsReason string = "DeprovisionBlockedByExistingCredentials"
57+
errorPollingLastOperationReason string = "ErrorPollingLastOperation"
58+
errorWithOriginatingIdentity string = "Error with Originating Identity"
59+
errorWithOngoingAsyncOperation string = "ErrorAsyncOperationInProgress"
60+
errorWithOngoingAsyncOperationMessage string = "Another operation for this service instance is in progress. "
61+
errorNonexistentClusterServiceClassReason string = "ReferencesNonexistentServiceClass"
62+
errorNonexistentClusterServiceClassMessage string = "ReferencesNonexistentServiceClass"
63+
errorNonexistentClusterServicePlanReason string = "ReferencesNonexistentServicePlan"
64+
errorNonexistentClusterServiceBrokerReason string = "ReferencesNonexistentBroker"
65+
errorFindingNamespaceServiceInstanceReason string = "ErrorFindingNamespaceForInstance"
66+
67+
asyncProvisioningReason string = "Provisioning"
68+
asyncProvisioningMessage string = "The instance is being provisioned asynchronously"
69+
asyncUpdatingInstanceReason string = "UpdatingInstance"
70+
asyncUpdatingInstanceMessage string = "The instance is being updated asynchronously"
71+
asyncDeprovisioningReason string = "Deprovisioning"
72+
asyncDeprovisioningMessage string = "The instance is being deprovisioned asynchronously"
73+
provisioningInFlightReason string = "ProvisionRequestInFlight"
74+
provisioningInFlightMessage string = "Provision request for ServiceInstance in-flight to Broker"
75+
instanceUpdatingInFlightReason string = "UpdateInstanceRequestInFlight"
76+
instanceUpdatingInFlightMessage string = "Update request for ServiceInstance in-flight to Broker"
77+
deprovisioningInFlightReason string = "DeprovisionRequestInFlight"
78+
deprovisioningInFlightMessage string = "Deprovision request for ServiceInstance in-flight to Broker"
79+
80+
successOrphanMitigationReason string = "OrphanMitigationSuccessful"
81+
errorOrphanMigitationReason string = "OrphanMitigationFailed"
82+
)
83+
4284
// ServiceInstance handlers and control-loop
4385

4486
func (c *controller) instanceAdd(obj interface{}) {

0 commit comments

Comments
 (0)