tests(integration): Move integration tests to tests/

Signed-off-by: Bhargav Ravuri <[email protected]>

Makefile

@@ -83,24 +83,33 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
  $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
+##@ Test
+
 .PHONY: fmt
-fmt: ## Run go fmt against code.
+fmt: ##  Run go fmt against code.
  go fmt ./...
 
 .PHONY: vet
-vet: ## Run go vet against code.
+vet: ##  Run go vet against code.
  go vet ./...
 
-.PHONY: test
-test: fmt vet envtest ## Run tests. 
- KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -v -coverprofile=coverage.out -coverpkg ./... ./...
+.PHONY: test-unit
+test-unit: ##  Run unit tests.
+ go test -v -coverprofile=coverage.out  `go list ./controllers/... ./pkg/... | grep -v ./pkg/mocks`
 
-.PHONY: unit-test-coverage
-unit-test-coverage: test
+.PHONY: test-coverage
+test-coverage: test-unit ## Run unit tests and print code coverage.
  go tool cover -func coverage.out
 
+.PHONY: test-integration
+test-integration: ## Run integration tests.
+ KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -v -tags=integration ./...
+
+.PHONY: test
+test: fmt vet envtest test-unit test-integration ## Run all tests (fmt, vet, envtest, unit & integration).
+
 .PHONY: test-docker
-test-docker:
+test-docker: ## Run all tests (fmt, vet, envtest, unit & integration) inside a Docker container.
  docker build -t test -f test.Dockerfile . && docker run test
 
 ##@ Build

pkg/hub/controllers/cluster/deregister_unit_test.go → pkg/hub/controllers/cluster/deregister_test.go

@@ -4,14 +4,14 @@ import (
  "context"
  "errors"
  "reflect"
- "runtime/debug"
  "testing"
 
  hubv1alpha1 "github.com/kubeslice/apis/pkg/controller/v1alpha1"
  "github.com/kubeslice/kubeslice-monitoring/pkg/metrics"
  kubeslicev1beta1 "github.com/kubeslice/worker-operator/api/v1beta1"
  utilmock "github.com/kubeslice/worker-operator/pkg/mocks"
  "github.com/prometheus/client_golang/prometheus"
+ "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/mock"
  batchv1 "k8s.io/api/batch/v1"
  corev1 "k8s.io/api/core/v1"
@@ -849,22 +849,20 @@ func TestReconcilerFailToCreateDeregisterJob(t *testing.T) {
 
 func TestGetConfigmapScriptData(t *testing.T) {
  data, err := getCleanupScript()
- AssertNoError(t, err)
- if len(data) == 0 {
- t.Fatalf("unable to get configmap data")
- }
+ assert.NoError(t, err)
+ assert.NotZero(t, len(data), "unable to get configmap data")
 }
 
 func TestConstructJobForClusterDeregister(t *testing.T) {
  job := constructJobForClusterDeregister()
- AssertEqual(t, job.Name, deregisterJobName)
- AssertEqual(t, job.Namespace, ControlPlaneNamespace)
+ assert.Equal(t, job.Name, deregisterJobName)
+ assert.Equal(t, job.Namespace, ControlPlaneNamespace)
 }
 
 func TestConstructServiceAccount(t *testing.T) {
  sa := constructServiceAccount()
- AssertEqual(t, sa.Name, serviceAccountName)
- AssertEqual(t, sa.Namespace, ControlPlaneNamespace)
+ assert.Equal(t, sa.Name, serviceAccountName)
+ assert.Equal(t, sa.Namespace, ControlPlaneNamespace)
 }
 
 func TestConstructClusterRole(t *testing.T) {
@@ -877,29 +875,14 @@ func TestConstructClusterRole(t *testing.T) {
 
 func TestConstructClusterRoleBinding(t *testing.T) {
  crb := constructClusterRoleBinding("random-uid")
- AssertEqual(t, crb.Name, clusterRoleBindingName)
- AssertEqual(t, crb.RoleRef, testClusterRoleRef)
- AssertEqual(t, len(crb.Subjects), 1)
- AssertEqual(t, crb.Subjects[0], testClusterRoleBindingSubject[0])
+ assert.Equal(t, crb.Name, clusterRoleBindingName)
+ assert.Equal(t, crb.RoleRef, testClusterRoleRef)
+ assert.Equal(t, len(crb.Subjects), 1)
+ assert.Equal(t, crb.Subjects[0], testClusterRoleBindingSubject[0])
 }
 
 func TestConstructConfigMap(t *testing.T) {
  data := "this is the data."
  cm := constructConfigMap(data)
- AssertEqual(t, cm.Data["kubeslice-cleanup.sh"], data)
-}
-
-func AssertEqual(t *testing.T, actual interface{}, expected interface{}) {
- t.Helper()
- if actual != expected {
- t.Log("expected --", expected, "actual --", actual)
- t.Fail()
- }
-}
-
-func AssertNoError(t *testing.T, err error) {
- t.Helper()
- if err != nil {
- t.Errorf("Expected No Error but got %s, Stack:\n%s", err, string(debug.Stack()))
- }
+ assert.Equal(t, cm.Data["kubeslice-cleanup.sh"], data)
 }

pkg/hub/controllers/cluster/reconciler_unit_test.go → pkg/hub/controllers/cluster/reconciler_test.go

@@ -178,7 +178,7 @@ func TestReconcilerHandleExternalDependency(t *testing.T) {
  client.StatusMock.On("Update",
  mock.IsType(ctx),
  mock.IsType(&hubv1alpha1.Cluster{}),
- mock.IsType([]k8sclient.UpdateOption(nil)),
+ mock.IsType([]k8sclient.SubResourceUpdateOption(nil)),
  ).Return(nil)
  client.On("List",
  mock.IsType(ctx),
@@ -295,7 +295,7 @@ func TestReconcilerToFailWhileCallingCreateDeregisterJob(t *testing.T) {
  client.StatusMock.On("Update",
  mock.IsType(ctx),
  mock.IsType(&hubv1alpha1.Cluster{}),
- mock.IsType([]k8sclient.UpdateOption(nil)),
+ mock.IsType([]k8sclient.SubResourceUpdateOption(nil)),
  ).Return(errors.New("error updating status of deregistration on the controller"))
  client.On("Create",
  mock.IsType(ctx),

pkg/hub/controllers/vpnkeyrotation/reconciler_unit_test.go → pkg/hub/controllers/vpnkeyrotation/reconciler_test.go

@@ -40,6 +40,8 @@ var (
  testWorkerNamespace = "kubeslice-system"
 )
 
+var k8sClient k8sclient.Client
+
 var testVPNKeyRotationObject = &hubv1alpha1.VpnKeyRotation{
  ObjectMeta: metav1.ObjectMeta{
  Name: testVPNKeyRotationName,

test.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

pkg/hub/controllers/cluster/cluster_suite_test.go → tests/hub/cluster/cluster_suite_test.go

@@ -28,6 +28,7 @@ import (
  kubeslicev1beta1 "github.com/kubeslice/worker-operator/api/v1beta1"
  ossEvents "github.com/kubeslice/worker-operator/events"
  "github.com/kubeslice/worker-operator/pkg/hub/controllers"
+ "github.com/kubeslice/worker-operator/pkg/hub/controllers/cluster"
  "github.com/prometheus/client_golang/prometheus"
 )
 
@@ -54,7 +55,7 @@ var _ = BeforeSuite(func() {
  By("bootstrapping test environment")
  testEnv = &envtest.Environment{
  CRDDirectoryPaths: []string{
- filepath.Join("../../../..", "config", "crd", "bases"),
+ filepath.Join("../../../", "config", "crd", "bases"),
  filepath.Join("./crds"),
  },
  ErrorIfCRDPathMissing: true,
@@ -127,7 +128,7 @@ var _ = BeforeSuite(func() {
  Component: "worker-operator",
  Namespace: CONTROL_PLANE_NS,
  })
- clusterReconciler := NewReconciler(
+ clusterReconciler := cluster.NewReconciler(
  k8sClient,
  k8sClient,
  &spokeClusterEventRecorder,

pkg/hub/controllers/vpnkeyrotation/vpnrotation_ctrl_test.go → tests/hub/vpnkeyrotation/vpnrotation_controller_test.go

@@ -11,6 +11,7 @@ import (
 
  kubeslicev1beta1 "github.com/kubeslice/worker-operator/api/v1beta1"
  ossEvents "github.com/kubeslice/worker-operator/events"
+ "github.com/kubeslice/worker-operator/pkg/hub/controllers/vpnkeyrotation"
  nsmv1 "github.com/networkservicemesh/sdk-k8s/pkg/tools/k8s/apis/networkservicemesh.io/v1"
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
@@ -75,7 +76,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
  ClusterGatewayMapping: map[string][]string{
  CLUSTER_NAME: {gws[0]},
  },
- Clusters: []string{ClusterName},
+ Clusters: []string{vpnkeyrotation.ClusterName},
  CertificateCreationTime: &metav1.Time{Time: time.Now()},
  },
  }
@@ -178,7 +179,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
  ClusterGatewayMapping: map[string][]string{
  CLUSTER_NAME: gws,
  },
- Clusters: []string{ClusterName},
+ Clusters: []string{vpnkeyrotation.ClusterName},
  CertificateCreationTime: &metav1.Time{Time: time.Now()},
  CertificateExpiryTime: &metav1.Time{Time: time.Now().AddDate(0, 0, 30)},
  RotationInterval: 30,
@@ -517,7 +518,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
  ClusterGatewayMapping: map[string][]string{
  CLUSTER_NAME: {gws[0]},
  },
- Clusters: []string{ClusterName},
+ Clusters: []string{vpnkeyrotation.ClusterName},
  CertificateCreationTime: &metav1.Time{Time: time.Now()},
  CertificateExpiryTime: &metav1.Time{Time: time.Now().AddDate(0, 0, 30)},
  RotationInterval: 30,
@@ -745,7 +746,7 @@ var _ = Describe("Hub VPN Key Rotation", func() {
  ClusterGatewayMapping: map[string][]string{
  "worker-1": gws,
  },
- Clusters: []string{ClusterName},
+ Clusters: []string{vpnkeyrotation.ClusterName},
  CertificateCreationTime: &metav1.Time{Time: time.Now()},
  },
  }

pkg/hub/controllers/vpnkeyrotation/vpnrotation_suite_test.go → tests/hub/vpnkeyrotation/vpnrotation_suite_test.go

@@ -33,6 +33,7 @@ import (
  "github.com/kubeslice/worker-operator/controllers/slicegateway"
  ossEvents "github.com/kubeslice/worker-operator/events"
  "github.com/kubeslice/worker-operator/pkg/hub/controllers"
+ "github.com/kubeslice/worker-operator/pkg/hub/controllers/vpnkeyrotation"
  hub "github.com/kubeslice/worker-operator/pkg/hub/hubclient"
  hce "github.com/kubeslice/worker-operator/tests/emulator/hubclient"
  workernetop "github.com/kubeslice/worker-operator/tests/emulator/workerclient/netop"
@@ -152,7 +153,7 @@ var _ = BeforeSuite(func() {
  if err != nil {
  os.Exit(1)
  }
- rotationReconciler := NewReconciler(
+ rotationReconciler := vpnkeyrotation.NewReconciler(
  k8sClient,
  &hub.HubClientConfig{
  Client: k8sClient,
@@ -222,7 +223,7 @@ var _ = AfterSuite(func() {
 func shouldProcessVpnKeyRotation(object client.Object) bool {
  vpn := object.(*hubv1alpha1.VpnKeyRotation)
  for _, v := range vpn.Spec.Clusters {
- if v == ClusterName {
+ if v == vpnkeyrotation.ClusterName {
  return true
  }
  }

pkg/manifest/file_test.go → tests/manifests/manifest_test.go

@@ -19,13 +19,20 @@
 package manifest_test
 
 import (
+ "testing"
+
  . "github.com/onsi/ginkgo/v2"
  . "github.com/onsi/gomega"
 
  "github.com/kubeslice/worker-operator/pkg/manifest"
  appsv1 "k8s.io/api/apps/v1"
 )
 
+func TestManifest(t *testing.T) {
+ RegisterFailHandler(Fail)
+ RunSpecs(t, "Manifest Suite")
+}
+
 var _ = Describe("Manifest File", func() {
 
  Context("With k8s deployment manifest", func() {

pkg/webhook/pod/webhook_test.go → tests/webhook/pod/pod_test.go

@@ -20,16 +20,22 @@ package pod_test
 
 import (
  "context"
-
- . "github.com/onsi/ginkgo/v2"
- . "github.com/onsi/gomega"
- "sigs.k8s.io/controller-runtime/pkg/client"
+ "testing"
 
  "github.com/kubeslice/worker-operator/controllers"
  "github.com/kubeslice/worker-operator/pkg/webhook/pod"
+
+ . "github.com/onsi/ginkgo/v2"
+ . "github.com/onsi/gomega"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+func TestDeploy(t *testing.T) {
+ RegisterFailHandler(Fail)
+ RunSpecs(t, "Deploy Webhook Suite")
+}
+
 type fakeWebhookClient struct{}
 
 func (f fakeWebhookClient) UpdateSliceApplicationNamespaces(ctx context.Context, slice string, namespace string) error {