Add TrackedCreateOrUpdate and WaitableSecretResource

Author: kabicin

common/secret.go

@@ -13,16 +13,30 @@ type SecretResource struct {
 	once   sync.Once
 }
 
+type WaitableSecretResource struct {
+	*SecretResource
+	wg sync.WaitGroup
+}
+
 // Creates a Secret that clears it's data when recCtx is canceled
 func NewSecret(recCtx context.Context, name, namespace string) *corev1.Secret {
 	secretResource := NewSecretResource(name, namespace)
 	go func() {
 		<-recCtx.Done()
-		secretResource.Clear()
+		secretResource.Clear(nil)
 	}()
 	return secretResource.GetSecret()
 }
 
+func NewWaitableSecret(recCtx context.Context, name, namespace string) (*corev1.Secret, *sync.WaitGroup) {
+	waitableSecretResource := NewWaitableSecretResource(name, namespace)
+	go func() {
+		<-recCtx.Done()
+		waitableSecretResource.Clear(waitableSecretResource.GetWaitGroup())
+	}()
+	return waitableSecretResource.GetSecret(), waitableSecretResource.GetWaitGroup()
+}
+
 func NewSecretResource(name, namespace string) *SecretResource {
 	resource := &SecretResource{
 		secret: &corev1.Secret{
@@ -35,16 +49,31 @@ func NewSecretResource(name, namespace string) *SecretResource {
 	return resource
 }
 
+func NewWaitableSecretResource(name, namespace string) *WaitableSecretResource {
+	resource := &WaitableSecretResource{
+		SecretResource: NewSecretResource(name, namespace),
+		wg:             sync.WaitGroup{},
+	}
+	return resource
+}
+
+func (wsr *WaitableSecretResource) GetWaitGroup() *sync.WaitGroup {
+	return &wsr.wg
+}
+
 func (r *SecretResource) GetSecret() *corev1.Secret {
 	return r.secret
 }
 
-func (r *SecretResource) Clear() {
+func (r *SecretResource) Clear(wg *sync.WaitGroup) {
 	if r.secret == nil {
 		return
 	}
 
 	r.once.Do(func() {
+		if wg != nil {
+			wg.Wait()
+		}
 		for secretKey, secretValue := range r.secret.Data {
 			clear(secretValue)
 			delete(r.secret.Data, secretKey)

utils/reconciler.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"math"
 	"strconv"
+	"sync"
 	"time"
 
 	networkingv1 "k8s.io/api/networking/v1"
@@ -172,6 +173,15 @@ func (r *ReconcilerBase) CreateOrUpdate(obj client.Object, owner metav1.Object,
 	return err
 }
 
+// Runs CreateOrUpdate tracked by a WaitGroup wg
+func (r *ReconcilerBase) TrackedCreateOrUpdate(obj client.Object, owner metav1.Object, reconcile func() error, wg *sync.WaitGroup) error {
+	if wg != nil {
+		wg.Add(1)
+		defer wg.Done()
+	}
+	return r.CreateOrUpdate(obj, owner, reconcile)
+}
+
 // DeleteResource deletes kubernetes resource
 func (r *ReconcilerBase) DeleteResource(obj client.Object) error {
 	err := r.client.Delete(context.TODO(), obj)

utils/service_binding_reconciler.go

@@ -29,10 +29,10 @@ func (r *ReconcilerBase) ReconcileBindings(recCtx context.Context, ba common.Bas
 
 func (r *ReconcilerBase) reconcileExpose(recCtx context.Context, ba common.BaseComponent) error {
 	mObj := ba.(metav1.Object)
-	bindingSecret := common.NewSecret(recCtx, getExposeBindingSecretName(ba), mObj.GetNamespace())
+	bindingSecret, wg := common.NewWaitableSecret(recCtx, getExposeBindingSecretName(ba), mObj.GetNamespace())
 
 	if ba.GetService() != nil && ba.GetService().GetBindable() != nil && *ba.GetService().GetBindable() {
-		err := r.CreateOrUpdate(bindingSecret, mObj, func() error {
+		err := r.TrackedCreateOrUpdate(bindingSecret, mObj, func() error {
 			customSecret := &corev1.Secret{}
 			// Check if custom values are provided in a secret, and apply the custom values
 			if err := r.getCustomValuesToExpose(customSecret, ba); err != nil {
@@ -43,7 +43,7 @@ func (r *ReconcilerBase) reconcileExpose(recCtx context.Context, ba common.BaseC
 			// Apply default values to the override secret if certain values are not set
 			r.applyDefaultValuesToExpose(recCtx, bindingSecret, ba)
 			return nil
-		})
+		}, wg)
 		if err != nil {
 			return err
 		}