Refactor LabTemplate API to support new scenarios #347

palexster · 2020-11-17T11:52:51Z

Description

This PR refactors the LabTemplate API to enable possible support to:

Persistent VMs (Ref. Persistent disk improvements #94)
Container-based Laboratories (Ref. [New feature] Container-based lab-instances #210)
Support for multiple Lab-Environements (e.g. labTemplate which spawns multiple VMs)
DeleteAfter Condition

To do so, we are required to change the APIs:

Kubevirt objects are not embedded in the API anymore

How Has This Been Tested?

palexster · 2020-11-23T09:37:51Z

/rebase

palexster · 2020-11-26T11:25:49Z

/deploy-staging

kingmakerbot · 2020-11-26T11:30:23Z

Your staging environment has been correctly deployed/updated!

Frontend: check it out at https://347.preprod.crownlabs.polito.it/login
Laboratory operator: add the ''preprod-347=true'' label to your namespace

operators/api/v1alpha1/labtemplate_types.go

operators/api/v1alpha2/common.go

operators/api/v1alpha2/labtemplate_types.go

operators/pkg/instanceCreation/creation.go

palexster · 2020-11-26T15:45:56Z

/deploy-staging

palexster · 2020-11-26T15:50:05Z

/undeploy-staging

kingmakerbot · 2020-11-26T15:50:29Z

Your staging environment has been correctly deployed/updated!

Frontend: check it out at https://347.preprod.crownlabs.polito.it/login
Laboratory operator: add the ''preprod-347=true'' label to your namespace

kingmakerbot · 2020-11-26T15:52:12Z

Your staging environment has been correctly teared-down!

palexster · 2020-11-26T15:52:45Z

/deploy-staging

kingmakerbot · 2020-11-26T15:57:08Z

Your staging environment has been correctly deployed/updated!

Frontend: check it out at https://347.preprod.crownlabs.polito.it/login
Laboratory operator: add the ''preprod-347=true'' label to your namespace

palexster · 2020-11-27T08:58:16Z

/rebase

kingmakerbot · 2020-11-27T08:59:59Z

The generated files in the operators/ folder appear to be out-of-date.

Please, ensure you are using the correct version of controller-gen and re-run:

make generate
make manifests

Here it is an excerpt of the diff:

diff --git a/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml b/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
index 33ca57b..f06d78f 100644
--- a/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
@@ -26,10 +26,12 @@ spec:
       description: ImageList is the Schema for the ImageList API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_instances.yaml b/operators/deploy/crds/crownlabs.polito.it_instances.yaml
index 4416635..d61d977 100644
--- a/operators/deploy/crds/crownlabs.polito.it_instances.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_instances.yaml
@@ -24,10 +24,12 @@ spec:
       description: Instance is the Schema for the labinstances API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml b/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
index a845e96..9e8d32e 100644
--- a/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
@@ -24,10 +24,12 @@ spec:
       description: LabInstance is the Schema for the labinstances API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml b/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
index e47539a..a2d51f8 100644
--- a/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
@@ -24,10 +24,12 @@ spec:
       description: LabTemplate is the Schema for the labtemplates API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
@@ -47,46 +49,67 @@ spec:
               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
               x-kubernetes-int-or-string: true
             vm:
-                description: VirtualMachineInstance is *the* VirtualMachineInstance Definition.
+                description: VirtualMachineInstance is *the* VirtualMachineInstance
+                  Definition.
               properties:
                 apiVersion:
-                    description: APIVersion defines the versioned schema of this representation of an object.
+                    description: APIVersion defines the versioned schema of this representation
+                      of an object.
                   type: string
                 kind:
-                    description: Kind is a string value representing the REST resource this object represents.
+                    description: Kind is a string value representing the REST resource
+                      this object represents.
                   type: string
                 metadata:
                   type: object
                 spec:
-                    description: VirtualMachineInstance Spec contains the VirtualMachineInstance specification.
+                    description: VirtualMachineInstance Spec contains the VirtualMachineInstance
+                      specification.

giorio94 · 2020-11-27T16:10:00Z

/rebase

kingmakerbot · 2020-11-27T16:11:42Z

The generated files in the operators/ folder appear to be out-of-date.

Please, ensure you are using the correct version of controller-gen and re-run:

make generate
make manifests

Here it is an excerpt of the diff:

diff --git a/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml b/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
index 33ca57b..f06d78f 100644
--- a/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
@@ -26,10 +26,12 @@ spec:
       description: ImageList is the Schema for the ImageList API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_instances.yaml b/operators/deploy/crds/crownlabs.polito.it_instances.yaml
index 4416635..d61d977 100644
--- a/operators/deploy/crds/crownlabs.polito.it_instances.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_instances.yaml
@@ -24,10 +24,12 @@ spec:
       description: Instance is the Schema for the labinstances API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml b/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
index a845e96..9e8d32e 100644
--- a/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
@@ -24,10 +24,12 @@ spec:
       description: LabInstance is the Schema for the labinstances API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml b/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
index e47539a..a2d51f8 100644
--- a/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
@@ -24,10 +24,12 @@ spec:
       description: LabTemplate is the Schema for the labtemplates API
       properties:
         apiVersion:
-            description: APIVersion defines the versioned schema of this representation of an object.
+            description: APIVersion defines the versioned schema of this representation
+              of an object.
           type: string
         kind:
-            description: Kind is a string value representing the REST resource this object represents.
+            description: Kind is a string value representing the REST resource this
+              object represents.
           type: string
         metadata:
           type: object
@@ -47,46 +49,67 @@ spec:
               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
               x-kubernetes-int-or-string: true
             vm:
-                description: VirtualMachineInstance is *the* VirtualMachineInstance Definition.
+                description: VirtualMachineInstance is *the* VirtualMachineInstance
+                  Definition.
               properties:
                 apiVersion:
-                    description: APIVersion defines the versioned schema of this representation of an object.
+                    description: APIVersion defines the versioned schema of this representation
+                      of an object.
                   type: string
                 kind:
-                    description: Kind is a string value representing the REST resource this object represents.
+                    description: Kind is a string value representing the REST resource
+                      this object represents.
                   type: string
                 metadata:
                   type: object
                 spec:
-                    description: VirtualMachineInstance Spec contains the VirtualMachineInstance specification.
+                    description: VirtualMachineInstance Spec contains the VirtualMachineInstance
+                      specification.

kingmakerbot · 2020-11-27T17:48:25Z

The generated files in the operators/ folder appear to be out-of-date.

Please, ensure you are using the correct version of controller-gen and re-run:

make generate
make manifests

Here it is an excerpt of the diff:

diff --git a/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml b/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
index 9a04056..a92e8fe 100644
--- a/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_imagelists.yaml
@@ -26,10 +26,14 @@ spec:
       description: ImageList is the Schema for the ImageList API
       properties:
         apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_instances.yaml b/operators/deploy/crds/crownlabs.polito.it_instances.yaml
index 6d2a656..f92321f 100644
--- a/operators/deploy/crds/crownlabs.polito.it_instances.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_instances.yaml
@@ -24,10 +24,14 @@ spec:
       description: Instance is the Schema for the labinstances API
       properties:
         apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml b/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
index 282786d..057d5c2 100644
--- a/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_labinstances.yaml
@@ -24,10 +24,14 @@ spec:
       description: LabInstance is the Schema for the labinstances API
       properties:
         apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
diff --git a/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml b/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
index 2d1c63f..fc8d5eb 100644
--- a/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
+++ b/operators/deploy/crds/crownlabs.polito.it_labtemplates.yaml
@@ -24,10 +24,14 @@ spec:
       description: LabTemplate is the Schema for the labtemplates API
       properties:
         apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -47,46 +51,89 @@ spec:
               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
               x-kubernetes-int-or-string: true
             vm:
-                description: VirtualMachineInstance is *the* VirtualMachineInstance Definition. It represents a virtual machine in the runtime environment of kubernetes.
+                description: VirtualMachineInstance is *the* VirtualMachineInstance
+                  Definition. It represents a virtual machine in the runtime environment
+                  of kubernetes.
               properties:
                 apiVersion:
-                    description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                    description: 'APIVersion defines the versioned schema of this
+                      representation of an object. Servers should convert recognized
+                      schemas to the latest internal value, and may reject unrecognized
+                      values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
                   type: string

Co-Authored-By: Marco Iorio <giorio94@gmail.com>

mlavacca · 2020-11-27T17:59:13Z

/merge

kingmakerbot · 2020-11-27T18:01:44Z

Your staging environment has been correctly teared-down!

pull-request-size bot added the size/L label Nov 17, 2020

kingmakerbot added the sig/api label Nov 17, 2020

palexster changed the title ~~Refactor LabTemplate to support container laboratory~~ Refactor LabTemplate API to support new scenarios Nov 17, 2020

palexster force-pushed the apa/new_labtemplate branch from d0016b1 to e7671d6 Compare November 22, 2020 18:29

kingmakerbot force-pushed the apa/new_labtemplate branch from e7671d6 to ff4826a Compare November 23, 2020 09:39

palexster force-pushed the apa/new_labtemplate branch 4 times, most recently from b0fe5f0 to 9a40238 Compare November 26, 2020 08:40

pull-request-size bot added size/XXL and removed size/L labels Nov 26, 2020

palexster force-pushed the apa/new_labtemplate branch 3 times, most recently from 1d9fee9 to 9179868 Compare November 26, 2020 11:03

palexster marked this pull request as ready for review November 26, 2020 11:04

giorio94 reviewed Nov 26, 2020

View reviewed changes

palexster force-pushed the apa/new_labtemplate branch 3 times, most recently from 7d1e4e0 to e93ea4a Compare November 26, 2020 15:34

palexster force-pushed the apa/new_labtemplate branch 2 times, most recently from 4957c37 to a2db207 Compare November 26, 2020 17:15

palexster force-pushed the apa/new_labtemplate branch 2 times, most recently from c584054 to b5b39fc Compare November 26, 2020 17:30

kingmakerbot force-pushed the apa/new_labtemplate branch from b5b39fc to c5ce544 Compare November 27, 2020 08:59

kingmakerbot force-pushed the apa/new_labtemplate branch from c5ce544 to 2c8770a Compare November 27, 2020 16:10

palexster force-pushed the apa/new_labtemplate branch from 2c8770a to 7881f89 Compare November 27, 2020 17:47

palexster force-pushed the apa/new_labtemplate branch from 7881f89 to 7b7fc31 Compare November 27, 2020 17:53

Refactoring APIs for Lab. Operator

a359763

Co-Authored-By: Marco Iorio <giorio94@gmail.com>

giorio94 approved these changes Nov 27, 2020

View reviewed changes

palexster force-pushed the apa/new_labtemplate branch from 7b7fc31 to a359763 Compare November 27, 2020 17:54

giorio94 added kind/feature New feature or request kind/breaking Breaking change and removed kind/feature New feature or request labels Nov 27, 2020

palexster added the kind/cleanup Refactoring code label Nov 27, 2020

mlavacca approved these changes Nov 27, 2020

View reviewed changes

kingmakerbot added the merge-requested label Nov 27, 2020

kingmakerbot merged commit 82612ad into master Nov 27, 2020

kingmakerbot deleted the apa/new_labtemplate branch November 27, 2020 17:59

kingmakerbot removed the merge-requested label Nov 27, 2020

This was referenced Nov 28, 2020

Fix a typo in the templates API #359

Merged

The laboratory-operator creates deprecated ingress resources #338

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor LabTemplate API to support new scenarios #347

Refactor LabTemplate API to support new scenarios #347

palexster commented Nov 17, 2020 •

edited

Loading

palexster commented Nov 23, 2020

palexster commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

palexster commented Nov 26, 2020

palexster commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

palexster commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

palexster commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

giorio94 commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

mlavacca commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

Refactor LabTemplate API to support new scenarios #347

Refactor LabTemplate API to support new scenarios #347

Conversation

palexster commented Nov 17, 2020 • edited Loading

Description

How Has This Been Tested?

palexster commented Nov 23, 2020

palexster commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

palexster commented Nov 26, 2020

palexster commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

palexster commented Nov 26, 2020

kingmakerbot commented Nov 26, 2020

palexster commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

giorio94 commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

mlavacca commented Nov 27, 2020

kingmakerbot commented Nov 27, 2020

palexster commented Nov 17, 2020 •

edited

Loading