set retryAfter for missing configmap/secret refs to 10s

Author: cbarbian-sap

pkg/component/component.go

@@ -226,7 +226,7 @@ func (s *Status) SetState(state State, reason string, message string) {
 	}
 	if status != cond.Status {
 		cond.Status = status
-		cond.LastTransitionTime = &[]metav1.Time{metav1.Now()}[0]
+		cond.LastTransitionTime = ref(metav1.Now())
 	}
 	cond.Reason = reason
 	cond.Message = message

pkg/component/reconcile.go

@@ -44,6 +44,7 @@ import (
 // TODO: allow some timeout feature, such that component will go into error state if not ready within the given timeout
 // (e.g. through a TimeoutConfiguration interface that components could optionally implement)
 // TODO: run admission webhooks (if present) in reconcile (e.g. as post-read hook)
+// TODO: improve overall log output
 
 const (
 	readyConditionReasonNew                = "FirstSeen"
@@ -114,18 +115,18 @@ type Reconciler[T Component] struct {
 // resourceGenerator must be an implementation of the manifests.Generator interface.
 func NewReconciler[T Component](name string, resourceGenerator manifests.Generator, options ReconcilerOptions) *Reconciler[T] {
 	if options.CreateMissingNamespaces == nil {
-		options.CreateMissingNamespaces = &[]bool{true}[0]
+		options.CreateMissingNamespaces = ref(true)
 	}
 	if options.AdoptionPolicy == nil {
-		options.AdoptionPolicy = &[]AdoptionPolicy{AdoptionPolicyAdoptUnowned}[0]
+		options.AdoptionPolicy = ref(AdoptionPolicyAdoptUnowned)
 	}
 	// TOOD: validate adoption policy
 
 	return &Reconciler[T]{
 		name:              name,
 		resourceGenerator: resourceGenerator,
 		options:           options,
-		backoff:           backoff.NewBackoff(5 * time.Second),
+		backoff:           backoff.NewBackoff(10 * time.Second),
 		postReadHooks:     []HookFunc[T]{resolveReferences[T]},
 	}
 }

pkg/component/reference.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"reflect"
 	"strings"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -30,6 +31,8 @@ const (
 	tagFallbackKeys   = "fallbackKeys"
 
 	notFoundPolicyIgnoreOnDeletion = "ignoreOnDeletion"
+
+	retryAfter = 10 * time.Second
 )
 
 // +kubebuilder:object:generate=true
@@ -50,7 +53,7 @@ func (r *ConfigMapReference) load(ctx context.Context, clnt client.Client, names
 			if ignoreNotFound {
 				return nil
 			}
-			return types.NewRetriableError(errors.Wrapf(err, "error loading configmap %s/%s", namespace, r.Name), nil)
+			return types.NewRetriableError(errors.Wrapf(err, "error loading configmap %s/%s", namespace, r.Name), ref(retryAfter))
 		} else {
 			return errors.Wrapf(err, "error loading configmap %s/%s", namespace, r.Name)
 		}
@@ -102,7 +105,7 @@ func (r *ConfigMapKeyReference) load(ctx context.Context, clnt client.Client, na
 			if ignoreNotFound {
 				return nil
 			}
-			return types.NewRetriableError(errors.Wrapf(err, "error loading configmap %s/%s", namespace, r.Name), nil)
+			return types.NewRetriableError(errors.Wrapf(err, "error loading configmap %s/%s", namespace, r.Name), ref(retryAfter))
 		} else {
 			return errors.Wrapf(err, "error loading configmap %s/%s", namespace, r.Name)
 		}
@@ -113,7 +116,7 @@ func (r *ConfigMapKeyReference) load(ctx context.Context, clnt client.Client, na
 			r.loaded = true
 			return nil
 		} else {
-			return types.NewRetriableError(fmt.Errorf("key %s not found in configmap %s/%s", r.Key, namespace, r.Name), nil)
+			return types.NewRetriableError(fmt.Errorf("key %s not found in configmap %s/%s", r.Key, namespace, r.Name), ref(retryAfter))
 		}
 	} else {
 		for _, key := range fallbackKeys {
@@ -123,7 +126,7 @@ func (r *ConfigMapKeyReference) load(ctx context.Context, clnt client.Client, na
 				return nil
 			}
 		}
-		return types.NewRetriableError(fmt.Errorf("no matching key found in configmap %s/%s", namespace, r.Name), nil)
+		return types.NewRetriableError(fmt.Errorf("no matching key found in configmap %s/%s", namespace, r.Name), ref(retryAfter))
 	}
 }
 
@@ -161,7 +164,7 @@ func (r *SecretReference) load(ctx context.Context, clnt client.Client, namespac
 			if ignoreNotFound {
 				return nil
 			}
-			return types.NewRetriableError(errors.Wrapf(err, "error loading secret %s/%s", namespace, r.Name), nil)
+			return types.NewRetriableError(errors.Wrapf(err, "error loading secret %s/%s", namespace, r.Name), ref(retryAfter))
 		} else {
 			return errors.Wrapf(err, "error loading secret %s/%s", namespace, r.Name)
 		}
@@ -213,7 +216,7 @@ func (r *SecretKeyReference) load(ctx context.Context, clnt client.Client, names
 			if ignoreNotFound {
 				return nil
 			}
-			return types.NewRetriableError(errors.Wrapf(err, "error loading secret %s/%s", namespace, r.Name), nil)
+			return types.NewRetriableError(errors.Wrapf(err, "error loading secret %s/%s", namespace, r.Name), ref(retryAfter))
 		} else {
 			return errors.Wrapf(err, "error loading secret %s/%s", namespace, r.Name)
 		}
@@ -224,7 +227,7 @@ func (r *SecretKeyReference) load(ctx context.Context, clnt client.Client, names
 			r.loaded = true
 			return nil
 		} else {
-			return types.NewRetriableError(fmt.Errorf("key %s not found in secret %s/%s", r.Key, namespace, r.Name), nil)
+			return types.NewRetriableError(fmt.Errorf("key %s not found in secret %s/%s", r.Key, namespace, r.Name), ref(retryAfter))
 		}
 	} else {
 		for _, key := range fallbackKeys {
@@ -234,7 +237,7 @@ func (r *SecretKeyReference) load(ctx context.Context, clnt client.Client, names
 				return nil
 			}
 		}
-		return types.NewRetriableError(fmt.Errorf("no matching key found in secret %s/%s", namespace, r.Name), nil)
+		return types.NewRetriableError(fmt.Errorf("no matching key found in secret %s/%s", namespace, r.Name), ref(retryAfter))
 	}
 }
 

pkg/component/target.go

@@ -752,10 +752,10 @@ func (t *reconcileTarget[T]) deleteObject(ctx context.Context, key types.ObjectK
 	object.SetGroupVersionKind(key.GetObjectKind().GroupVersionKind())
 	object.SetNamespace(key.GetNamespace())
 	object.SetName(key.GetName())
-	deleteOptions := &client.DeleteOptions{PropagationPolicy: &[]metav1.DeletionPropagation{metav1.DeletePropagationBackground}[0]}
+	deleteOptions := &client.DeleteOptions{PropagationPolicy: ref(metav1.DeletePropagationBackground)}
 	if existingObject != nil {
 		deleteOptions.Preconditions = &metav1.Preconditions{
-			ResourceVersion: &[]string{existingObject.GetResourceVersion()}[0],
+			ResourceVersion: ref(existingObject.GetResourceVersion()),
 		}
 	}
 	if err := t.client.Delete(ctx, object, deleteOptions); err != nil {

pkg/component/util.go

@@ -25,6 +25,10 @@ import (
 	"github.com/sap/component-operator-runtime/pkg/types"
 )
 
+func ref[T any](x T) *T {
+	return &x
+}
+
 func sha256hex(data []byte) string {
 	sum := sha256.Sum256(data)
 	return hex.EncodeToString(sum[:])