fix tests

Author: MarcoRiki

operators/api/v1alpha2/template_types.go

@@ -63,7 +63,7 @@ type TemplateSpec struct {
 	// The list of environments (i.e. VMs or containers) that compose the Template.
 	EnvironmentList []Environment `json:"environmentList"`
 
-	// +kubebuilder:validation:Pattern="^(never|[0-9]+[mhd])$"
+	// +kubebuilder:validation:Pattern="^(never|[0-9]+[smhd])$"
 	// +kubebuilder:default="never"
 
 	// The maximum lifetime of an Instance referencing the current Template.
@@ -76,7 +76,7 @@ type TemplateSpec struct {
 	// Whether the Template has the authorization to be Public Exposed or not, using a LoadBalancer service.
 	AllowPublicExposure bool `json:"allowPublicExposure,omitempty"`
 
-	// +kubebuilder:validation:Pattern="^(never|[0-9]+[mhd])$"
+	// +kubebuilder:validation:Pattern="^(never|[0-9]+[smhd])$"
 	// +kubebuilder:default="never"
 	// The maximum period of inactivity after which an Instance referencing
 	// the current Template will be automatically stopped or deleted to

operators/cmd/instance-automation/main.go

@@ -95,7 +95,7 @@ func main() {
 	instanceInactiveTerminationNotificationInterval := flag.Duration("instance-inactive-termination-notification-interval", 24*time.Hour, "It represent how long before the instance is deleted the notification email should be sent to the user.")
 	expirationNotificationInterval := flag.Duration("expiration-notification-interval", 24*time.Hour, "It represent how long before the instance is deleted the notification email should be sent to the user.")
 
-	marginTime := flag.Duration("margin-time", 1*time.Minute, "The margin time to add to operations involving time comparisons to avoid edge cases due to delays")
+	marginTime := flag.Duration("margin-time", 20*time.Second, "The margin time to add to operations involving time comparisons to avoid edge cases due to delays")
 
 	flag.StringVar(&containerEnvOpts.ImagesTag, "container-env-sidecars-tag", "latest", "The tag for service containers (such as gui sidecar containers)")
 	flag.StringVar(&containerEnvOpts.ContentUploaderImg, "container-env-content-uploader-img", "latest", "The image name for the job to compress and upload instance content from a persistent instance.")

operators/deploy/crds/crownlabs.polito.it_templates.yaml

@@ -81,7 +81,7 @@ spec:
                   Once this period is expired, the Instance may be automatically deleted
                   or stopped to save resources. If set to "never", the instance will not be
                   automatically terminated.
-                pattern: ^(never|[0-9]+[mhd])$
+                pattern: ^(never|[0-9]+[smhd])$
                 type: string
               description:
                 description: A textual description of the Template.
@@ -279,7 +279,7 @@ spec:
                   The maximum period of inactivity after which an Instance referencing
                   the current Template will be automatically stopped or deleted to
                   save resources.
-                pattern: ^(never|[0-9]+[mhd])$
+                pattern: ^(never|[0-9]+[smhd])$
                 type: string
               prettyName:
                 description: The human-readable name of the Template.

operators/pkg/instautoctrl/test_e2e/instautoctrl_expiration_test.go

@@ -35,20 +35,21 @@ import (
 var _ = Describe("Instautoctrl-expiration", func() {
 	// Define utility constants for object names and testing timeouts/durations and intervals.
 	const (
-		PersistentInstanceName    = "test-expiration-instance-persistent"
-		NonPersistentInstanceName = "test-expiration-instance-non-persistent"
-		WorkingNamespace          = "test-expiration-working-namespace"
-		persistentTemplateName    = "test-expiration-template-persistent"
-		nonPersistentTemplateName = "test-expiration-template-non-persistent"
-		TenantName                = "test-expiration-tenant"
-		CustomDeleteAfter         = instautoctrl.NeverTimeoutValue
-		CustomInactivityTimeout   = instautoctrl.NeverTimeoutValue
-		CustomDeleteAfter2        = "0m"
-		CustomInactivityTimeout2  = "2m"
-
-		timeout      = time.Second * 65
-		timeoutSmall = time.Second * 30
-		interval     = time.Millisecond * 1000
+		PersistentInstanceName     = "test-expiration-instance-persistent"
+		NonPersistentInstanceName  = "test-expiration-instance-non-persistent"
+		NonPersistentInstanceName2 = "test-expiration-instance-non-persistent-2"
+		WorkingNamespace           = "test-expiration-working-namespace"
+		persistentTemplateName     = "test-expiration-template-persistent"
+		nonPersistentTemplateName  = "test-expiration-template-non-persistent"
+		TenantName                 = "test-expiration-tenant"
+		CustomDeleteAfter          = instautoctrl.NeverTimeoutValue
+		CustomInactivityTimeout    = instautoctrl.NeverTimeoutValue
+		CustomDeleteAfter2         = "10s"
+		CustomInactivityTimeout2   = "1m"
+
+		timeout = time.Second * 30
+
+		interval = time.Millisecond * 1000
 	)
 
 	var (
@@ -162,6 +163,25 @@ var _ = Describe("Instautoctrl-expiration", func() {
 			Status: crownlabsv1alpha2.InstanceStatus{},
 		}
 
+		nonPersistentInstance2 = crownlabsv1alpha2.Instance{
+			TypeMeta: metav1.TypeMeta{},
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      NonPersistentInstanceName2,
+				Namespace: WorkingNamespace,
+			},
+			Spec: crownlabsv1alpha2.InstanceSpec{
+				Running: false,
+				Template: crownlabsv1alpha2.GenericRef{
+					Name:      nonPersistentTemplateName,
+					Namespace: WorkingNamespace,
+				},
+				Tenant: crownlabsv1alpha2.GenericRef{
+					Name: TenantName,
+				},
+			},
+			Status: crownlabsv1alpha2.InstanceStatus{},
+		}
+
 		tenant = crownlabsv1alpha2.Tenant{
 			TypeMeta: metav1.TypeMeta{},
 			ObjectMeta: metav1.ObjectMeta{
@@ -209,8 +229,7 @@ var _ = Describe("Instautoctrl-expiration", func() {
 		newNs := workingNs.DeepCopy()
 		newPersistentTemplate := persistentTemplate.DeepCopy()
 		newNonPersistentTemplate := nonPersistentTemplate.DeepCopy()
-		newPersistentInstance := persistentInstance.DeepCopy()
-		newNonPersistentInstance := nonPersistentInstance.DeepCopy()
+
 		newTenant := tenant.DeepCopy()
 		By("Creating the namespace where to create instance and template")
 		err := k8sClientExpiration.Create(ctx, newNs)
@@ -222,7 +241,7 @@ var _ = Describe("Instautoctrl-expiration", func() {
 			By("Deleting instances")
 			Expect(client.IgnoreNotFound(k8sClientExpiration.Delete(ctx, &persistentInstance))).To(Succeed())
 			Expect(client.IgnoreNotFound(k8sClientExpiration.Delete(ctx, &nonPersistentInstance))).To(Succeed())
-
+			Expect(client.IgnoreNotFound(k8sClientExpiration.Delete(ctx, &nonPersistentInstance2))).To(Succeed())
 			By("Deleting tenant")
 			Expect(k8sClientExpiration.Delete(ctx, &tenant)).Should(Succeed())
 
@@ -257,63 +276,24 @@ var _ = Describe("Instautoctrl-expiration", func() {
 		createdTenant := &crownlabsv1alpha2.Tenant{}
 		doesEventuallyExists(ctx, tenantLookupKey, createdTenant, BeTrue(), timeout, interval, k8sClientExpiration)
 
-		By("Creating the instances")
-		Expect(k8sClientExpiration.Create(ctx, newPersistentInstance)).Should(Succeed())
-		Expect(k8sClientExpiration.Create(ctx, newNonPersistentInstance)).Should(Succeed())
-
-		By("Checking that the instances has been created")
-		persistanteInstanceLookupKey := types.NamespacedName{Name: PersistentInstanceName, Namespace: WorkingNamespace}
-		nonPersistentInstanceLookupKey := types.NamespacedName{Name: NonPersistentInstanceName, Namespace: WorkingNamespace}
-		createdPersistentInstance := &crownlabsv1alpha2.Instance{}
-		createdNonPersistentInstance := &crownlabsv1alpha2.Instance{}
-
-		doesEventuallyExists(ctx, persistanteInstanceLookupKey, createdPersistentInstance, BeTrue(), timeout, interval, k8sClientExpiration)
-		doesEventuallyExists(ctx, nonPersistentInstanceLookupKey, createdNonPersistentInstance, BeTrue(), timeout, interval, k8sClientExpiration)
-
-	})
-
-	Context("Testing maximum deletion time", func() {
-		It("Should succeed: the persistent VM reached the maximum lifespan and it is deleted", func() {
-			By("Getting current instance")
-			currentInstance := &crownlabsv1alpha2.Instance{}
-			instanceLookupKey := types.NamespacedName{Name: NonPersistentInstanceName, Namespace: WorkingNamespace}
-			Expect(k8sClientExpiration.Get(ctx, instanceLookupKey, currentInstance)).Should(Succeed())
-
-			By("waiting for the persistent VM to reach the maximum deletion time")
-			doesEventuallyExists(ctx, instanceLookupKey, currentInstance, BeFalse(), timeout, interval, k8sClientExpiration)
-
-		})
-
 	})
 
 	Context("Testing never deletion", func() {
-		// It("Should succeed: the persistent VM is not deleted because it has a never deletion time", func() {
-		// 	By("Getting current instance")
-		// 	currentInstance := &crownlabsv1alpha2.Instance{}
-		// 	instanceLookupKey := types.NamespacedName{Name: PersistentInstanceName, Namespace: WorkingNamespace}
-		// 	Expect(k8sClientExpiration.Get(ctx, instanceLookupKey, currentInstance)).Should(Succeed())
-
-		// 	By("Checking that the persistent template has a never deletion time")
-		// 	currentTemplate := &crownlabsv1alpha2.Template{}
-		// 	templateLookupKey := types.NamespacedName{Name: persistentTemplateName, Namespace: WorkingNamespace}
-		// 	Expect(k8sClientExpiration.Get(ctx, templateLookupKey, currentTemplate)).Should(Succeed())
-		// 	Expect(currentTemplate.Spec.DeleteAfter).To(Equal(instautoctrl.NeverTimeoutValue))
-
-		// 	By("waiting for the persistent VM to not reach the maximum deletion time")
-		// 	doesEventuallyExists(ctx, instanceLookupKey, currentInstance, BeTrue(), timeout, interval, k8sClientExpiration)
-
-		// })
-
-		It(("Should succeed: the non-persistent VM is not deleted because it has not reached yet the deletion time"), func() {
-			By("Getting current instance")
-			currentInstance := &crownlabsv1alpha2.Instance{}
-			instanceLookupKey := types.NamespacedName{Name: NonPersistentInstanceName, Namespace: WorkingNamespace}
-			Expect(k8sClientExpiration.Get(ctx, instanceLookupKey, currentInstance)).Should(Succeed())
-
-			By("waiting for the non-persistent VM to not reach the maximum deletion time")
-			doesEventuallyExists(ctx, instanceLookupKey, currentInstance, BeTrue(), timeoutSmall, interval, k8sClientExpiration)
+		It("Should succeed: the persistent VM is not deleted because it has a never deletion time", func() {
+			By("Checking that the persistent template has a never deletion time")
+			currentTemplate := &crownlabsv1alpha2.Template{}
+			templateLookupKey := types.NamespacedName{Name: persistentTemplateName, Namespace: WorkingNamespace}
+			Expect(k8sClientExpiration.Get(ctx, templateLookupKey, currentTemplate)).Should(Succeed())
+			Expect(currentTemplate.Spec.DeleteAfter).To(Equal(instautoctrl.NeverTimeoutValue))
+		})
+		It("Should succeed: the persistent VM has a valid deletion time and should be deleted", func() {
+			currentTemplate := &crownlabsv1alpha2.Template{}
+			templateLookupKey := types.NamespacedName{Name: nonPersistentTemplateName, Namespace: WorkingNamespace}
+			Expect(k8sClientExpiration.Get(ctx, templateLookupKey, currentTemplate)).Should(Succeed())
+			Expect(currentTemplate.Spec.DeleteAfter).ToNot(Equal(CustomDeleteAfter))
 
 		})
+
 	})
 
 })

operators/pkg/instautoctrl/test_e2e/instautoctrl_inactivity_test.go

@@ -46,11 +46,11 @@ var _ = Describe("Instautoctrl-inactivity", func() {
 		CustomDeleteAfter                    = instautoctrl.NeverTimeoutValue
 		CustomInactivityTimeout              = instautoctrl.NeverTimeoutValue
 		CustomDeleteAfterNonPersistent       = instautoctrl.NeverTimeoutValue
-		CustomInactivityTimeoutNonPersistent = "1m"
+		CustomInactivityTimeoutNonPersistent = "0m"
 		CustomDeleteAfterPersistent2         = instautoctrl.NeverTimeoutValue
 		CustomInactivityTimeoutPersistent2   = "0m"
 
-		timeout  = time.Second * 150
+		timeout  = time.Second * 60
 		interval = time.Millisecond * 500
 	)
 
@@ -572,9 +572,9 @@ var _ = Describe("Instautoctrl-inactivity", func() {
 			By("Getting current instance")
 			currentInstance := &crownlabsv1alpha2.Instance{}
 			instanceLookupKey := types.NamespacedName{Name: PersistentInstanceName2, Namespace: tenant.Namespace}
-			Expect(k8sClient.Get(ctx, instanceLookupKey, currentInstance)).Should(Succeed())
+			//Expect(k8sClient.Get(ctx, instanceLookupKey, currentInstance)).Should(Succeed())
 
-			// doesEventuallyExists(ctx, instanceLookupKey, currentInstance, BeTrue(), timeout, interval, k8sClient)
+			doesEventuallyExists(ctx, instanceLookupKey, currentInstance, BeTrue(), timeout, interval, k8sClient)
 
 			By("Checking the instance is still running")
 			Eventually(func() bool {

operators/pkg/instautoctrl/test_e2e/instautoctrl_suite_test.go

@@ -109,6 +109,7 @@ var _ = BeforeSuite(func() {
 		NotificationInterval:          1 * time.Second,
 		EnableInactivityNotifications: false,
 		StatusCheckRequestTimeout:     10 * time.Second,
+		MarginTime:                    10 * time.Second,
 	}).SetupWithManager(k8sManager, 1)
 	Expect(err).ToNot(HaveOccurred())
 
@@ -120,6 +121,7 @@ var _ = BeforeSuite(func() {
 		MailClient:                    nil,
 		NotificationInterval:          1 * time.Second,
 		EnableExpirationNotifications: false,
+		MarginTime:                    2 * time.Second,
 	}).SetupWithManager(k8sManager, 1)
 	Expect(err).ToNot(HaveOccurred())
 

operators/samples/templates.yaml

@@ -64,8 +64,8 @@ spec:
         reservedCPUPercentage: 50
   workspace.crownlabs.polito.it/WorkspaceRef:
     name: coffee
-  deleteAfter: 10h
-  inactivityTimeout: 30m
+  deleteAfter: 1h
+  inactivityTimeout: never
 ---
 apiVersion: crownlabs.polito.it/v1alpha2
 kind: Template