Merge pull request #11 from CAAPIM/cron_update

fixed deregister of jobs for background sync tasks
CAAPIM · Sep 23, 2023 · c2bc124 · c2bc124
2 parents 1f2e465 + 75cc5e6
commit c2bc124
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ deploy.sh
 .dockerconfigjson
 dev
 license.xml
+.DS_Store
diff --git a/pkg/gateway/reconcile/externalkeys.go b/pkg/gateway/reconcile/externalkeys.go
@@ -22,7 +22,7 @@ func syncExternalKeys(ctx context.Context, params Params) {
 		}
 	}
 	if cntr == 0 {
-		_ = s.RemoveByTag("sync-external-keys")
+		_ = s.RemoveByTag(params.Instance.Name + "-sync-external-keys")
 	}
 
 	err := reconcileExternalKeys(ctx, params)

diff --git a/pkg/gateway/reconcile/externalsecrets.go b/pkg/gateway/reconcile/externalsecrets.go
@@ -24,6 +24,8 @@ func syncExternalSecrets(ctx context.Context, params Params) error {
 	err := params.Client.Get(ctx, types.NamespacedName{Name: params.Instance.Name, Namespace: params.Instance.Namespace}, gateway)
 	if err != nil && k8serrors.IsNotFound(err) {
 		params.Log.Error(err, "gateway not found", "Name", params.Instance.Name, "namespace", params.Instance.Namespace)
+		_ = s.RemoveByTag(params.Instance.Name + "-sync-external-secrets")
+		return nil
 	}
 
 	cntr := 0
@@ -33,7 +35,7 @@ func syncExternalSecrets(ctx context.Context, params Params) error {
 		}
 	}
 	if cntr == 0 {
-		_ = s.RemoveByTag("sync-external-secrets")
+		_ = s.RemoveByTag(params.Instance.Name + "-sync-external-secrets")
 		return nil
 	}
 

diff --git a/pkg/gateway/reconcile/l7repositories.go b/pkg/gateway/reconcile/l7repositories.go
@@ -18,6 +18,8 @@ func syncRepository(ctx context.Context, params Params) {
 	err := params.Client.Get(ctx, types.NamespacedName{Name: params.Instance.Name, Namespace: params.Instance.Namespace}, gateway)
 	if err != nil && k8serrors.IsNotFound(err) {
 		params.Log.Error(err, "gateway not found", "name", params.Instance.Name, "namespace", params.Instance.Namespace)
+		_ = removeJob(params.Instance.Name + "-sync-repository-references")
+		return
 	}
 
 	cntr := 0
@@ -28,11 +30,7 @@ func syncRepository(ctx context.Context, params Params) {
 	}
 	if cntr == 0 {
 		_ = removeJob(params.Instance.Name + "-sync-repository-references")
-	}
-
-	err = params.Client.Get(ctx, types.NamespacedName{Name: params.Instance.Name, Namespace: params.Instance.Namespace}, gateway)
-	if err != nil && k8serrors.IsNotFound(err) {
-		params.Log.Error(err, "gateway not found", "name", params.Instance.Name, "namespace", params.Instance.Namespace)
+		return
 	}
 
 	for _, repoRef := range gateway.Spec.App.RepositoryReferences {

diff --git a/pkg/gateway/reconcile/pdb.go b/pkg/gateway/reconcile/pdb.go
@@ -14,6 +14,9 @@ import (
 )
 
 func PodDisruptionBudget(ctx context.Context, params Params) error {
+	if !params.Instance.Spec.App.PodDisruptionBudget.Enabled {
+		return nil
+	}
 	desiredPdb := gateway.NewPDB(params.Instance)
 	currentPdb := &policyv1.PodDisruptionBudget{}
 

diff --git a/pkg/repository/reconcile/repository.go b/pkg/repository/reconcile/repository.go
@@ -18,6 +18,7 @@ func syncRepository(ctx context.Context, params Params) error {
 	repository, err := getRepository(ctx, params)
 	if err != nil {
 		params.Log.Info("repository unavailable", "name", params.Instance.Name, "namespace", params.Instance.Namespace, "error", err.Error())
+		_ = s.RemoveByTag(params.Instance.Name + "-sync-repository")
 		return nil
 	}
 
@@ -30,7 +31,7 @@ func syncRepository(ctx context.Context, params Params) error {
 
 	repoStatus := repository.Status
 	if !repository.Spec.Enabled {
-		params.Log.Info("repository not enabled", "name", repository.Name, "namespace", repository.Namespace)
+		params.Log.V(2).Info("repository not enabled", "name", repository.Name, "namespace", repository.Namespace)
 		return nil
 	}
 
@@ -57,7 +58,6 @@ func syncRepository(ctx context.Context, params Params) error {
 
 	if err != nil {
 		params.Log.V(2).Info("repository error", "name", repository.Name, "namespace", repository.Namespace, "error", err.Error())
-		//return err
 		return nil
 	}
 
@@ -77,7 +77,7 @@ func syncRepository(ctx context.Context, params Params) error {
 	repoStatus.StorageSecretName = storageSecretName
 
 	if !reflect.DeepEqual(repoStatus, repository.Status) {
-		params.Log.Info("syncing repository", "name", repository.Name, "namespace", repository.Namespace)
+		params.Log.V(2).Info("syncing repository", "name", repository.Name, "namespace", repository.Namespace)
 
 		repoStatus.Updated = time.Now().String()
 		repository.Status = repoStatus