Move controller constants into correct files (openshift#1373)

jboyd01 · Oct 12, 2017 · 8ad6a31 · 8ad6a31
1 parent 7bd66dd
commit 8ad6a31
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 76 deletions.
diff --git a/pkg/controller/controller_binding.go b/pkg/controller/controller_binding.go
@@ -37,6 +37,26 @@ import (
 	"k8s.io/client-go/tools/cache"
 )
 
+const (
+	errorNonexistentServiceInstanceReason     string = "ReferencesNonexistentInstance"
+	errorBindCallReason                       string = "BindCallFailed"
+	errorInjectingBindResultReason            string = "ErrorInjectingBindResult"
+	errorEjectingBindReason                   string = "ErrorEjectingServiceBinding"
+	errorEjectingBindMessage                  string = "Error ejecting binding."
+	errorUnbindCallReason                     string = "UnbindCallFailed"
+	errorNonbindableClusterServiceClassReason string = "ErrorNonbindableServiceClass"
+	errorServiceInstanceNotReadyReason        string = "ErrorInstanceNotReady"
+	errorServiceBindingOrphanMitigation       string = "ServiceBindingNeedsOrphanMitigation"
+
+	successInjectedBindResultReason  string = "InjectedBindResult"
+	successInjectedBindResultMessage string = "Injected bind result"
+	successUnboundReason             string = "UnboundSuccessfully"
+	bindingInFlightReason            string = "BindingRequestInFlight"
+	bindingInFlightMessage           string = "Binding request for ServiceBinding in-flight to Broker"
+	unbindingInFlightReason          string = "UnbindingRequestInFlight"
+	unbindingInFlightMessage         string = "Unbind request for ServiceBinding in-flight to Broker"
+)
+
 // bindingControllerKind contains the schema.GroupVersionKind for this controller type.
 var bindingControllerKind = v1beta1.SchemeGroupVersion.WithKind("ServiceBinding")
 

diff --git a/pkg/controller/controller_broker.go b/pkg/controller/controller_broker.go
@@ -33,6 +33,33 @@ import (
 	"k8s.io/client-go/tools/cache"
 )
 
+// the Message strings have a terminating period and space so they can
+// be easily combined with a follow on specific message.
+const (
+	errorFetchingCatalogReason  string = "ErrorFetchingCatalog"
+	errorFetchingCatalogMessage string = "Error fetching catalog. "
+	errorSyncingCatalogReason   string = "ErrorSyncingCatalog"
+	errorSyncingCatalogMessage  string = "Error syncing catalog from ServiceBroker. "
+
+	errorListingClusterServiceClassesReason  string = "ErrorListingServiceClasses"
+	errorListingClusterServiceClassesMessage string = "Error listing service classes."
+	errorListingClusterServicePlansReason    string = "ErrorListingServicePlans"
+	errorListingClusterServicePlansMessage   string = "Error listing service plans."
+	errorDeletingClusterServiceClassReason   string = "ErrorDeletingServiceClass"
+	errorDeletingClusterServiceClassMessage  string = "Error deleting service class."
+	errorDeletingClusterServicePlanReason    string = "ErrorDeletingServicePlan"
+	errorDeletingClusterServicePlanMessage   string = "Error deleting service plan."
+	errorAuthCredentialsReason               string = "ErrorGettingAuthCredentials"
+
+	successFetchedCatalogReason               string = "FetchedCatalog"
+	successFetchedCatalogMessage              string = "Successfully fetched catalog entries from broker."
+	successClusterServiceBrokerDeletedReason  string = "DeletedSuccessfully"
+	successClusterServiceBrokerDeletedMessage string = "The broker %v was deleted successfully."
+
+	// these reasons are re-used in other controller files.
+	errorReconciliationRetryTimeoutReason string = "ErrorReconciliationRetryTimeout"
+)
+
 func (c *controller) brokerAdd(obj interface{}) {
 	// DeletionHandlingMetaNamespaceKeyFunc returns a unique key for the resource and
 	// handles the special case where the resource is of DeletedFinalStateUnknown type, which
@@ -61,82 +88,6 @@ func (c *controller) brokerDelete(obj interface{}) {
 	glog.V(4).Infof("Received delete event for ClusterServiceBroker %v; no further processing will occur", broker.Name)
 }
 
-// the Message strings have a terminating period and space so they can
-// be easily combined with a follow on specific message.
-const (
-	errorFetchingCatalogReason                 string = "ErrorFetchingCatalog"
-	errorFetchingCatalogMessage                string = "Error fetching catalog. "
-	errorSyncingCatalogReason                  string = "ErrorSyncingCatalog"
-	errorSyncingCatalogMessage                 string = "Error syncing catalog from ServiceBroker. "
-	errorWithParameters                        string = "ErrorWithParameters"
-	errorListingClusterServiceClassesReason    string = "ErrorListingServiceClasses"
-	errorListingClusterServiceClassesMessage   string = "Error listing service classes."
-	errorListingClusterServicePlansReason      string = "ErrorListingServicePlans"
-	errorListingClusterServicePlansMessage     string = "Error listing service plans."
-	errorDeletingClusterServiceClassReason     string = "ErrorDeletingServiceClass"
-	errorDeletingClusterServiceClassMessage    string = "Error deleting service class."
-	errorDeletingClusterServicePlanReason      string = "ErrorDeletingServicePlan"
-	errorDeletingClusterServicePlanMessage     string = "Error deleting service plan."
-	errorNonexistentClusterServiceClassReason  string = "ReferencesNonexistentServiceClass"
-	errorNonexistentClusterServiceClassMessage string = "ReferencesNonexistentServiceClass"
-	errorNonexistentClusterServicePlanReason   string = "ReferencesNonexistentServicePlan"
-	errorNonexistentClusterServiceBrokerReason string = "ReferencesNonexistentBroker"
-	errorNonexistentServiceInstanceReason      string = "ReferencesNonexistentInstance"
-	errorAuthCredentialsReason                 string = "ErrorGettingAuthCredentials"
-	errorFindingNamespaceServiceInstanceReason string = "ErrorFindingNamespaceForInstance"
-	errorProvisionCallFailedReason             string = "ProvisionCallFailed"
-	errorErrorCallingProvisionReason           string = "ErrorCallingProvision"
-	errorUpdateInstanceCallFailedReason        string = "UpdateInstanceCallFailed"
-	errorErrorCallingUpdateInstanceReason      string = "ErrorCallingUpdateInstance"
-	errorDeprovisionCalledReason               string = "DeprovisionCallFailed"
-	errorDeprovisionBlockedByCredentialsReason string = "DeprovisionBlockedByExistingCredentials"
-	errorBindCallReason                        string = "BindCallFailed"
-	errorInjectingBindResultReason             string = "ErrorInjectingBindResult"
-	errorEjectingBindReason                    string = "ErrorEjectingServiceBinding"
-	errorEjectingBindMessage                   string = "Error ejecting binding."
-	errorUnbindCallReason                      string = "UnbindCallFailed"
-	errorWithOngoingAsyncOperation             string = "ErrorAsyncOperationInProgress"
-	errorWithOngoingAsyncOperationMessage      string = "Another operation for this service instance is in progress. "
-	errorNonbindableClusterServiceClassReason  string = "ErrorNonbindableServiceClass"
-	errorServiceInstanceNotReadyReason         string = "ErrorInstanceNotReady"
-	errorPollingLastOperationReason            string = "ErrorPollingLastOperation"
-	errorWithOriginatingIdentity               string = "Error with Originating Identity"
-	errorReconciliationRetryTimeoutReason      string = "ErrorReconciliationRetryTimeout"
-	errorServiceBindingOrphanMitigation        string = "ServiceBindingNeedsOrphanMitigation"
-	errorOrphanMigitationReason                string = "OrphanMitigationFailed"
-
-	successInjectedBindResultReason           string = "InjectedBindResult"
-	successInjectedBindResultMessage          string = "Injected bind result"
-	successDeprovisionReason                  string = "DeprovisionedSuccessfully"
-	successDeprovisionMessage                 string = "The instance was deprovisioned successfully"
-	successUpdateInstanceReason               string = "InstanceUpdatedSuccessfully"
-	successUpdateInstanceMessage              string = "The instance was updated successfully"
-	successProvisionReason                    string = "ProvisionedSuccessfully"
-	successProvisionMessage                   string = "The instance was provisioned successfully"
-	successFetchedCatalogReason               string = "FetchedCatalog"
-	successFetchedCatalogMessage              string = "Successfully fetched catalog entries from broker."
-	successClusterServiceBrokerDeletedReason  string = "DeletedSuccessfully"
-	successClusterServiceBrokerDeletedMessage string = "The broker %v was deleted successfully."
-	successUnboundReason                      string = "UnboundSuccessfully"
-	successOrphanMitigationReason             string = "OrphanMitigationSuccessful"
-	asyncProvisioningReason                   string = "Provisioning"
-	asyncProvisioningMessage                  string = "The instance is being provisioned asynchronously"
-	asyncUpdatingInstanceReason               string = "UpdatingInstance"
-	asyncUpdatingInstanceMessage              string = "The instance is being updated asynchronously"
-	asyncDeprovisioningReason                 string = "Deprovisioning"
-	asyncDeprovisioningMessage                string = "The instance is being deprovisioned asynchronously"
-	bindingInFlightReason                     string = "BindingRequestInFlight"
-	bindingInFlightMessage                    string = "Binding request for ServiceBinding in-flight to Broker"
-	unbindingInFlightReason                   string = "UnbindingRequestInFlight"
-	unbindingInFlightMessage                  string = "Unbind request for ServiceBinding in-flight to Broker"
-	provisioningInFlightReason                string = "ProvisionRequestInFlight"
-	provisioningInFlightMessage               string = "Provision request for ServiceInstance in-flight to Broker"
-	instanceUpdatingInFlightReason            string = "UpdateInstanceRequestInFlight"
-	instanceUpdatingInFlightMessage           string = "Update request for ServiceInstance in-flight to Broker"
-	deprovisioningInFlightReason              string = "DeprovisionRequestInFlight"
-	deprovisioningInFlightMessage             string = "Deprovision request for ServiceInstance in-flight to Broker"
-)
-
 // shouldReconcileClusterServiceBroker determines whether a broker should be reconciled; it
 // returns true unless the broker has a ready condition with status true and
 // the controller's broker relist interval has not elapsed since the broker's

diff --git a/pkg/controller/controller_instance.go b/pkg/controller/controller_instance.go
@@ -39,6 +39,48 @@ import (
 	"k8s.io/client-go/tools/cache"
 )
 
+const (
+	successDeprovisionReason     string = "DeprovisionedSuccessfully"
+	successDeprovisionMessage    string = "The instance was deprovisioned successfully"
+	successUpdateInstanceReason  string = "InstanceUpdatedSuccessfully"
+	successUpdateInstanceMessage string = "The instance was updated successfully"
+	successProvisionReason       string = "ProvisionedSuccessfully"
+	successProvisionMessage      string = "The instance was provisioned successfully"
+
+	errorWithParameters                        string = "ErrorWithParameters"
+	errorProvisionCallFailedReason             string = "ProvisionCallFailed"
+	errorErrorCallingProvisionReason           string = "ErrorCallingProvision"
+	errorUpdateInstanceCallFailedReason        string = "UpdateInstanceCallFailed"
+	errorErrorCallingUpdateInstanceReason      string = "ErrorCallingUpdateInstance"
+	errorDeprovisionCalledReason               string = "DeprovisionCallFailed"
+	errorDeprovisionBlockedByCredentialsReason string = "DeprovisionBlockedByExistingCredentials"
+	errorPollingLastOperationReason            string = "ErrorPollingLastOperation"
+	errorWithOriginatingIdentity               string = "Error with Originating Identity"
+	errorWithOngoingAsyncOperation             string = "ErrorAsyncOperationInProgress"
+	errorWithOngoingAsyncOperationMessage      string = "Another operation for this service instance is in progress. "
+	errorNonexistentClusterServiceClassReason  string = "ReferencesNonexistentServiceClass"
+	errorNonexistentClusterServiceClassMessage string = "ReferencesNonexistentServiceClass"
+	errorNonexistentClusterServicePlanReason   string = "ReferencesNonexistentServicePlan"
+	errorNonexistentClusterServiceBrokerReason string = "ReferencesNonexistentBroker"
+	errorFindingNamespaceServiceInstanceReason string = "ErrorFindingNamespaceForInstance"
+
+	asyncProvisioningReason         string = "Provisioning"
+	asyncProvisioningMessage        string = "The instance is being provisioned asynchronously"
+	asyncUpdatingInstanceReason     string = "UpdatingInstance"
+	asyncUpdatingInstanceMessage    string = "The instance is being updated asynchronously"
+	asyncDeprovisioningReason       string = "Deprovisioning"
+	asyncDeprovisioningMessage      string = "The instance is being deprovisioned asynchronously"
+	provisioningInFlightReason      string = "ProvisionRequestInFlight"
+	provisioningInFlightMessage     string = "Provision request for ServiceInstance in-flight to Broker"
+	instanceUpdatingInFlightReason  string = "UpdateInstanceRequestInFlight"
+	instanceUpdatingInFlightMessage string = "Update request for ServiceInstance in-flight to Broker"
+	deprovisioningInFlightReason    string = "DeprovisionRequestInFlight"
+	deprovisioningInFlightMessage   string = "Deprovision request for ServiceInstance in-flight to Broker"
+
+	successOrphanMitigationReason string = "OrphanMitigationSuccessful"
+	errorOrphanMigitationReason   string = "OrphanMitigationFailed"
+)
+
 // ServiceInstance handlers and control-loop
 
 func (c *controller) instanceAdd(obj interface{}) {