Added Backup Service test-suite

api/v1beta1/aerospikebackup_webhook.go

@@ -21,13 +21,12 @@ import (
 	"fmt"
 	"reflect"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	utilRuntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientGoScheme "k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

api/v1beta1/aerospikebackupservice_webhook.go

@@ -17,13 +17,14 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/abhishekdwivedi3060/aerospike-backup-service/pkg/model"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 	"sigs.k8s.io/yaml"
+
+	"github.com/abhishekdwivedi3060/aerospike-backup-service/pkg/model"
 )
 
 // log is for logging in this package.

api/v1beta1/aerospikerestore_webhook.go

@@ -21,13 +21,14 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/abhishekdwivedi3060/aerospike-backup-service/pkg/model"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 	"sigs.k8s.io/yaml"
+
+	"github.com/abhishekdwivedi3060/aerospike-backup-service/pkg/model"
 )
 
 // log is for logging in this package.

config/samples/asdb_v1beta1_aerospikebackupservice.yaml

@@ -10,7 +10,7 @@ metadata:
   name: aerospikebackupservice-sample
   namespace: aerospike
 spec:
-  image: aerospike.jfrog.io/ecosystem-container-prod-local/aerospike-backup-service:0.3.0
+  image: aerospike.jfrog.io/ecosystem-container-prod-local/aerospike-backup-service:1.0.0
   config:
     service:
       http:
@@ -27,7 +27,7 @@ spec:
     storage:
       local:
         path: /localStorage
-        type: 0
+        type: local
   secrets:
     - secretName: auth-secret
       volumeMount:

controllers/backup-service/reconciler.go

@@ -64,6 +64,11 @@ func (r *SingleBackupServiceReconciler) Reconcile() (result ctrl.Result, recErr
 		}
 	}()
 
+	if !r.aeroBackupService.ObjectMeta.DeletionTimestamp.IsZero() {
+		// Stop reconciliation as the Aerospike Backup service is being deleted
+		return reconcile.Result{}, nil
+	}
+
 	// Set the status to AerospikeClusterInProgress before starting any operations
 	if err := r.setStatusPhase(asdbv1beta1.AerospikeBackupServiceInProgress); err != nil {
 		return reconcile.Result{}, err
@@ -273,11 +278,9 @@ func (r *SingleBackupServiceReconciler) reconcileDeployment() error {
 				return err
 			}
 		}
-
-		return r.waitForDeploymentToBeReady()
 	}
 
-	return nil
+	return r.waitForDeploymentToBeReady()
 }
 
 func getBackupServiceName(aeroBackupService *asdbv1beta1.AerospikeBackupService) types.NamespacedName {
@@ -568,7 +571,7 @@ func (r *SingleBackupServiceReconciler) getBackupServiceConfig() (*serviceConfig
 func (r *SingleBackupServiceReconciler) waitForDeploymentToBeReady() error {
 	const (
 		podStatusTimeout       = 2 * time.Minute
-		podStatusRetryInterval = time.Second * 5
+		podStatusRetryInterval = 5 * time.Second
 	)
 
 	r.Log.Info(
@@ -583,7 +586,8 @@ func (r *SingleBackupServiceReconciler) waitForDeploymentToBeReady() error {
 			}
 
 			if len(podList.Items) == 0 {
-				return false, fmt.Errorf("no pod found for deployment")
+				r.Log.Info("No pod found for deployment")
+				return false, nil
 			}
 
 			for idx := range podList.Items {
@@ -609,7 +613,7 @@ func (r *SingleBackupServiceReconciler) waitForDeploymentToBeReady() error {
 			}
 
 			if deploy.Status.Replicas != *deploy.Spec.Replicas {
-				return false, fmt.Errorf("deployment status is not updated")
+				return false, nil
 			}
 
 			return true, nil
@@ -628,7 +632,7 @@ func (r *SingleBackupServiceReconciler) setStatusPhase(phase asdbv1beta1.Aerospi
 		r.aeroBackupService.Status.Phase = phase
 
 		if err := r.Client.Status().Update(context.Background(), r.aeroBackupService); err != nil {
-			r.Log.Error(err, fmt.Sprintf("Failed to set restore status to %s", phase))
+			r.Log.Error(err, fmt.Sprintf("Failed to set backup service status to %s", phase))
 			return err
 		}
 	}

controllers/restore/reconciler.go

@@ -30,6 +30,11 @@ type SingleRestoreReconciler struct {
 }
 
 func (r *SingleRestoreReconciler) Reconcile() (result ctrl.Result, recErr error) {
+	if !r.aeroRestore.ObjectMeta.DeletionTimestamp.IsZero() {
+		// Stop reconciliation as the Aerospike restore is being deleted
+		return reconcile.Result{}, nil
+	}
+
 	if err := r.setStatusPhase(asdbv1beta1.AerospikeRestoreInProgress); err != nil {
 		return ctrl.Result{}, err
 	}

go.mod

@@ -22,7 +22,7 @@ require (
 )
 
 require (
-	github.com/abhishekdwivedi3060/aerospike-backup-service v0.0.0-20240604175608-042db47ee091
+	github.com/abhishekdwivedi3060/aerospike-backup-service v0.0.0-20240709182036-38038c5c38c7
 	github.com/aerospike/aerospike-client-go/v7 v7.4.0
 	github.com/deckarep/golang-set/v2 v2.3.1
 	github.com/sirupsen/logrus v1.9.0

go.sum

@@ -1,5 +1,5 @@
-github.com/abhishekdwivedi3060/aerospike-backup-service v0.0.0-20240604175608-042db47ee091 h1:eY5MT18Ocf5cCHohbZ1qcdophb/aOqr066lwSM3zGPk=
-github.com/abhishekdwivedi3060/aerospike-backup-service v0.0.0-20240604175608-042db47ee091/go.mod h1:CMA+bHRLvL/Kj/aLlbu95iNnlPnvP67q62X81b5e2G4=
+github.com/abhishekdwivedi3060/aerospike-backup-service v0.0.0-20240709182036-38038c5c38c7 h1:BP+LMehEXEsUE2HGT/Wn1ib0ZarBLHjjzg+x6XGIJ1s=
+github.com/abhishekdwivedi3060/aerospike-backup-service v0.0.0-20240709182036-38038c5c38c7/go.mod h1:CMA+bHRLvL/Kj/aLlbu95iNnlPnvP67q62X81b5e2G4=
 github.com/aerospike/aerospike-client-go/v7 v7.4.0 h1:g8/7v8RHhQhTArhW3C7Au7o+u8j8x5eySZL6MXfpHKU=
 github.com/aerospike/aerospike-client-go/v7 v7.4.0/go.mod h1:pPKnWiS8VDJcH4IeB1b8SA2TWnkjcVLHwAAJ+BHfGK8=
 github.com/aerospike/aerospike-management-lib v1.4.0 h1:wT0l3kwzXv5DV5Cd+hD0BQq3hjSIyaPX1HaUb1304TI=

test/backup_service/backup_service_suite_test.go

@@ -0,0 +1,106 @@
+package backupservice
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gexec"
+	admissionv1 "k8s.io/api/admission/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	k8Runtime "k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
+	asdbv1beta1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1beta1"
+	"github.com/aerospike/aerospike-kubernetes-operator/controllers/common"
+)
+
+var cfg *rest.Config
+
+var testEnv *envtest.Environment
+
+var k8sClient client.Client
+
+var scheme = k8Runtime.NewScheme()
+
+var testCtx = context.TODO()
+
+var pkgLog = ctrl.Log.WithName("test")
+
+const (
+	name      = "backup-service"
+	namespace = "test"
+)
+
+func TestBackupService(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "BackupService Suite")
+}
+
+var _ = BeforeSuite(
+	func() {
+		logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
+
+		By("Bootstrapping test environment")
+		t := true
+		testEnv = &envtest.Environment{
+			UseExistingCluster: &t,
+		}
+		var err error
+
+		cfg, err = testEnv.Start()
+		Expect(err).NotTo(HaveOccurred())
+		Expect(cfg).NotTo(BeNil())
+
+		err = clientgoscheme.AddToScheme(scheme)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = asdbv1.AddToScheme(scheme)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = asdbv1beta1.AddToScheme(scheme)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = admissionv1.AddToScheme(scheme)
+		Expect(err).NotTo(HaveOccurred())
+
+		// +kubebuilder:scaffold:scheme
+
+		k8sClient, err = client.New(
+			cfg, client.Options{Scheme: scheme},
+		)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(k8sClient).NotTo(BeNil())
+
+		sa := corev1.ServiceAccount{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      common.AerospikeBackupService,
+				Namespace: namespace,
+			},
+		}
+
+		err = k8sClient.Create(testCtx, &sa)
+		if err != nil && !errors.IsAlreadyExists(err) {
+			Fail(err.Error())
+		}
+	})
+
+var _ = AfterSuite(
+	func() {
+		By("tearing down the test environment")
+		gexec.KillAndWait(5 * time.Second)
+		err := testEnv.Stop()
+		Expect(err).ToNot(HaveOccurred())
+	},
+)