Skip to content

Commit

Permalink
introduce error code range for gateway controller
Browse files Browse the repository at this point in the history
  • Loading branch information
Amila-Rukshan committed Apr 10, 2023
1 parent 46a93b1 commit cf8086d
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 11 deletions.
64 changes: 64 additions & 0 deletions adapter/pkg/logging/logging_constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,20 @@ const (
error3002 = 3002
)

// Error codes gateway controller (3100-3199)
const (
error3100 = 3100
error3101 = 3101
error3102 = 3102
error3103 = 3103
error3104 = 3104
error3105 = 3105
error3106 = 3106
error3107 = 3107
error3108 = 3108
error3109 = 3109
)

// Mapper used to keep error details for error logs
var Mapper = map[int]ErrorDetails{
error2600: {
Expand Down Expand Up @@ -329,4 +343,54 @@ var Mapper = map[int]ErrorDetails{
Message: "Error creating ssh public key: %s",
Severity: CRITICAL,
},
error3100: {
ErrorCode: error3100,
Message: "Error watching Gateway resources: %v",
Severity: BLOCKER,
},
error3101: {
ErrorCode: error3101,
Message: "Error watching APIPolicy resources: %v",
Severity: BLOCKER,
},
error3102: {
ErrorCode: error3102,
Message: "Error watching Backend resources: %v",
Severity: BLOCKER,
},
error3103: {
ErrorCode: error3103,
Message: "Error watching ConfigMap resources: %v",
Severity: BLOCKER,
},
error3104: {
ErrorCode: error3104,
Message: "Error watching Secret resources: %v",
Severity: BLOCKER,
},
error3105: {
ErrorCode: error3105,
Message: "Error resolving listener certificates: %v",
Severity: BLOCKER,
},
error3106: {
ErrorCode: error3106,
Message: "Unable to find associated Backends for Secret: %s",
Severity: CRITICAL,
},
error3107: {
ErrorCode: error3107,
Message: "Unexpected object type, bypassing reconciliation: %v",
Severity: TRIVIAL,
},
error3108: {
ErrorCode: error3108,
Message: "Unable to find associated Backends for ConfigMap: %s",
Severity: CRITICAL,
},
error3109: {
ErrorCode: error3109,
Message: "Error while updating Gateway status %v",
Severity: BLOCKER,
},
}
22 changes: 11 additions & 11 deletions adapter/pkg/operator/controllers/dp/gateway_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func NewGatewayController(mgr manager.Manager, operatorDataStore *synchronizer.O

if err := c.Watch(&source.Kind{Type: &gwapiv1b1.Gateway{}}, &handler.EnqueueRequestForObject{},
predicates...); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2611, err))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3100, err))
return err
}

Expand All @@ -106,25 +106,25 @@ func NewGatewayController(mgr manager.Manager, operatorDataStore *synchronizer.O

if err := c.Watch(&source.Kind{Type: &dpv1alpha1.APIPolicy{}}, handler.EnqueueRequestsFromMapFunc(r.getGatewaysForAPIPolicy),
predicates...); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2617, err))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3101, err))
return err
}

if err := c.Watch(&source.Kind{Type: &dpv1alpha1.Backend{}}, handler.EnqueueRequestsFromMapFunc(r.getGatewaysForBackend),
predicates...); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2615, err))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3102, err))
return err
}

if err := c.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.getGatewaysForConfigMap),
predicates...); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2644, err))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3103, err))
return err
}

if err := c.Watch(&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.getGatewaysForSecret),
predicates...); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2645, err))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3104, err))
return err
}

Expand Down Expand Up @@ -204,7 +204,7 @@ func (gatewayReconciler *GatewayReconciler) resolveGatewayState(ctx context.Cont
for _, listener := range gateway.Spec.Listeners {
data, err := gatewayReconciler.resolveListenerSecretRefs(ctx, &listener.TLS.CertificateRefs[0], string(namespace))
if err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2612, err))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3105, err))
return nil, err
}
resolvedListenerCerts[string(listener.Name)] = data
Expand Down Expand Up @@ -299,15 +299,15 @@ func (gatewayReconciler *GatewayReconciler) getGatewaysForSecret(obj k8client.Ob
ctx := context.Background()
secret, ok := obj.(*corev1.Secret)
if !ok {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2622, secret))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3107, secret))
return []reconcile.Request{}
}

backendList := &dpv1alpha1.BackendList{}
if err := gatewayReconciler.client.List(ctx, backendList, &k8client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(secretBackend, utils.NamespacedName(secret).String()),
}); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2621, utils.NamespacedName(secret).String()))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3106, utils.NamespacedName(secret).String()))
return []reconcile.Request{}
}

Expand All @@ -324,15 +324,15 @@ func (gatewayReconciler *GatewayReconciler) getGatewaysForConfigMap(obj k8client
ctx := context.Background()
configMap, ok := obj.(*corev1.ConfigMap)
if !ok {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2622, configMap))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3107, configMap))
return []reconcile.Request{}
}

backendList := &dpv1alpha1.BackendList{}
if err := gatewayReconciler.client.List(ctx, backendList, &k8client.ListOptions{
FieldSelector: fields.OneTermEqualSelector(configMapBackend, utils.NamespacedName(configMap).String()),
}); err != nil {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2638, utils.NamespacedName(configMap).String()))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3108, utils.NamespacedName(configMap).String()))
return []reconcile.Request{}
}

Expand Down Expand Up @@ -366,7 +366,7 @@ func (gatewayReconciler *GatewayReconciler) handleGatewayStatus(gatewayKey types
UpdateStatus: func(obj k8client.Object) k8client.Object {
h, ok := obj.(*gwapiv1b1.Gateway)
if !ok {
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(2626, obj))
loggers.LoggerAPKOperator.ErrorC(logging.GetErrorByCode(3109, obj))
}
hCopy := h.DeepCopy()
var gwCondition []metav1.Condition = hCopy.Status.Conditions
Expand Down

0 comments on commit cf8086d

Please sign in to comment.