Merge branch 'test/e2e' into 'develop'

feat: update CleanPodPolicyALL to CleanPodPolicyAll

See merge request platform/CloudNative4AI/cluster-lifecycle/di-orchestrator!43

.gitlab-ci.yml

 variables:
   REGISTRY: registry.sensetime.com/cloudnative4ai
-  VERSION: v0.2.0-alpha.0
+  VERSION: v0.2.0-rc.0
   PROJECT: di-orchestrator
   # dind config
   DOCKER_HOST: tcp://localhost:2376

Makefile

 
 # di-operator version
-VERSION ?= v0.2.0-alpha.0
+VERSION ?= v0.2.0-rc.0
 MASTER_VERSION := $(VERSION)
 
 COMMIT_SHORT_SHA=$(shell git log -n 1 | head -n 1 | sed -e 's/^commit //' | head -c 8)

api/v1alpha1/dijob_types.go

@@ -65,8 +65,8 @@ const (
 	// CleanPodPolicyRunning means deleting all running pods of the job after completed
 	CleanPodPolicyRunning CleanPodPolicy = "Running"
 
-	// CleanPodPolicyALL means deleting all pods of the job after completed
-	CleanPodPolicyALL CleanPodPolicy = "ALL"
+	// CleanPodPolicyAll means deleting all pods of the job after completed
+	CleanPodPolicyAll CleanPodPolicy = "All"
 
 	// CleanPodPolicyNone means never deleting any pods of the job after completed
 	CleanPodPolicyNone CleanPodPolicy = "None"

api/v1alpha1/dijob_webhook.go

@@ -59,10 +59,10 @@ func (r *DIJob) ValidateCreate() error {
 	dijoblog.Info("validate create", "name", r.Name)
 
 	// TODO(user): fill in your validation logic upon object creation.
-	if r.Spec.CleanPodPolicy != CleanPodPolicyALL && r.Spec.CleanPodPolicy != CleanPodPolicyNone &&
+	if r.Spec.CleanPodPolicy != CleanPodPolicyAll && r.Spec.CleanPodPolicy != CleanPodPolicyNone &&
 		r.Spec.CleanPodPolicy != CleanPodPolicyRunning {
 		return fmt.Errorf("Invalid CleanPodPolicy %s, expected in [%s, %s, %s]",
-			r.Spec.CleanPodPolicy, CleanPodPolicyNone, CleanPodPolicyRunning, CleanPodPolicyALL)
+			r.Spec.CleanPodPolicy, CleanPodPolicyNone, CleanPodPolicyRunning, CleanPodPolicyAll)
 	}
 	return nil
 }
@@ -72,10 +72,10 @@ func (r *DIJob) ValidateUpdate(old runtime.Object) error {
 	dijoblog.Info("validate update", "name", r.Name)
 
 	// TODO(user): fill in your validation logic upon object update.
-	if r.Spec.CleanPodPolicy != CleanPodPolicyALL && r.Spec.CleanPodPolicy != CleanPodPolicyNone &&
+	if r.Spec.CleanPodPolicy != CleanPodPolicyAll && r.Spec.CleanPodPolicy != CleanPodPolicyNone &&
 		r.Spec.CleanPodPolicy != CleanPodPolicyRunning {
 		return fmt.Errorf("Invalid CleanPodPolicy %s, expected in [%s, %s, %s]",
-			r.Spec.CleanPodPolicy, CleanPodPolicyNone, CleanPodPolicyRunning, CleanPodPolicyALL)
+			r.Spec.CleanPodPolicy, CleanPodPolicyNone, CleanPodPolicyRunning, CleanPodPolicyAll)
 	}
 	return nil
 }

api/v1alpha1/webhook_test.go

@@ -23,7 +23,7 @@ var _ = Describe("Webhook test", func() {
 			}
 			testCases := []testCase{
 				{cleanPodPolicy: CleanPodPolicyRunning, expectCleanPodPolicy: CleanPodPolicyRunning},
-				{cleanPodPolicy: CleanPodPolicyALL, expectCleanPodPolicy: CleanPodPolicyALL},
+				{cleanPodPolicy: CleanPodPolicyAll, expectCleanPodPolicy: CleanPodPolicyAll},
 				{cleanPodPolicy: CleanPodPolicyNone, expectCleanPodPolicy: CleanPodPolicyNone},
 				{cleanPodPolicy: CleanPodPolicy(""), expectCleanPodPolicy: CleanPodPolicyRunning},
 				{cleanPodPolicy: CleanPodPolicy("hello"), expectCleanPodPolicy: CleanPodPolicy("will be refused by webhook")},
@@ -42,7 +42,7 @@ var _ = Describe("Webhook test", func() {
 				err = k8sClient.Create(ctx, job, &client.CreateOptions{})
 				if err != nil {
 					if c.cleanPodPolicy != CleanPodPolicyRunning && c.cleanPodPolicy != CleanPodPolicyNone &&
-						c.cleanPodPolicy != CleanPodPolicyALL {
+						c.cleanPodPolicy != CleanPodPolicyAll {
 						Expect(err.Error()).To(ContainSubstring("Invalid CleanPodPolicy"))
 						continue
 					} else {
@@ -69,7 +69,7 @@ var _ = Describe("Webhook test", func() {
 			}
 			testCases := []testCase{
 				{cleanPodPolicy: CleanPodPolicyRunning, expectCleanPodPolicy: CleanPodPolicyRunning},
-				{cleanPodPolicy: CleanPodPolicyALL, expectCleanPodPolicy: CleanPodPolicyALL},
+				{cleanPodPolicy: CleanPodPolicyAll, expectCleanPodPolicy: CleanPodPolicyAll},
 				{cleanPodPolicy: CleanPodPolicyNone, expectCleanPodPolicy: CleanPodPolicyNone},
 				{cleanPodPolicy: CleanPodPolicy(""), expectCleanPodPolicy: CleanPodPolicyRunning},
 				{cleanPodPolicy: CleanPodPolicy("hello"), expectCleanPodPolicy: CleanPodPolicy("will be refused by webhook")},
@@ -90,7 +90,7 @@ var _ = Describe("Webhook test", func() {
 				err = k8sClient.Update(ctx, job, &client.UpdateOptions{})
 				if err != nil {
 					if c.cleanPodPolicy != CleanPodPolicyRunning && c.cleanPodPolicy != CleanPodPolicyNone &&
-						c.cleanPodPolicy != CleanPodPolicyALL {
+						c.cleanPodPolicy != CleanPodPolicyAll {
 						Expect(err.Error()).To(ContainSubstring("Invalid CleanPodPolicy"))
 						continue
 					} else {

config/di-manager.yaml

@@ -55,6 +55,7 @@ spec:
             description: AggregatorConfigSpec defines the desired state of AggregatorConfig
             properties:
               aggregator:
+                description: AggregatorSpec defines the desired state of aggregator
                 properties:
                   template:
                     description: PodTemplateSpec describes the data a pod should have when created from a template
@@ -16320,7 +16321,7 @@ spec:
         - --leader-elect
         command:
         - /di-operator
-        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-rc.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -16371,7 +16372,7 @@ spec:
         - --lease-lock-name=di-server
         command:
         - /di-server
-        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-rc.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -16411,7 +16412,7 @@ spec:
       containers:
       - command:
         - /di-webhook
-        image: registry.sensetime.com/cloudnative4ai/di-webhook:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-webhook:v0.2.0-rc.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

config/manager/di_operator.yaml

@@ -27,7 +27,7 @@ spec:
         - /di-operator
         args:
         - "--server-address=http://di-server.di-system:8080"
-        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-rc.0
         imagePullPolicy: Always
         name: manager
         securityContext:

config/manager/di_server.yaml

@@ -23,7 +23,7 @@ spec:
         - "--leader-elect"
         - "--lease-lock-namespace=di-system"
         - "--lease-lock-name=di-server"
-        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-rc.0
         imagePullPolicy: Always
         name: server
         securityContext:

config/manager/di_webhook.yaml

@@ -18,7 +18,7 @@ spec:
       containers:
       - command:
         - /di-webhook
-        image: registry.sensetime.com/cloudnative4ai/di-webhook:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-webhook:v0.2.0-rc.0
         imagePullPolicy: Always
         name: webhook
         securityContext:

config/manager/kustomization.yaml

@@ -7,10 +7,10 @@ kind: Kustomization
 images:
 - name: registry.sensetime.com/cloudnative4ai/di-operator
   newName: registry.sensetime.com/cloudnative4ai/di-operator
-  newTag: v0.2.0-alpha.0
+  newTag: v0.2.0-rc.0
 - name: registry.sensetime.com/cloudnative4ai/di-server
   newName: registry.sensetime.com/cloudnative4ai/di-server
-  newTag: v0.2.0-alpha.0
+  newTag: v0.2.0-rc.0
 - name: registry.sensetime.com/cloudnative4ai/di-webhook
   newName: registry.sensetime.com/cloudnative4ai/di-webhook
-  newTag: v0.2.0-alpha.0
+  newTag: v0.2.0-rc.0

config/samples/agconfig.yaml

@@ -9,7 +9,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED

config/samples/dijob-cartpole.yaml

@@ -19,7 +19,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED
@@ -162,7 +162,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED
@@ -189,7 +189,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED

config/samples/dijob-qbert.yaml

@@ -19,7 +19,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED
@@ -170,7 +170,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED
@@ -200,7 +200,7 @@ spec:
       spec:
         containers:
         - name: di-container
-          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.0-75c41277
+          image: registry.sensetime.com/cloudnative4ai/ding:v0.1.1-3b98cb70
           imagePullPolicy: Always
           env:
           - name: PYTHONUNBUFFERED

config/v1.15.5/di-manager.yaml

@@ -325,7 +325,7 @@ spec:
         - --leader-elect
         command:
         - /di-operator
-        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-operator:v0.2.0-rc.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -376,7 +376,7 @@ spec:
         - --lease-lock-name=di-server
         command:
         - /di-server
-        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-server:v0.2.0-rc.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -416,7 +416,7 @@ spec:
       containers:
       - command:
         - /di-webhook
-        image: registry.sensetime.com/cloudnative4ai/di-webhook:v0.2.0-alpha.0
+        image: registry.sensetime.com/cloudnative4ai/di-webhook:v0.2.0-rc.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

controllers/dijob_controller.go

@@ -139,7 +139,7 @@ func (r *DIJobReconciler) deletePodsAndServices(ctx context.Context, job *div1al
 		}
 	}
 
-	if job.Spec.CleanPodPolicy != div1alpha1.CleanPodPolicyALL &&
+	if job.Spec.CleanPodPolicy != div1alpha1.CleanPodPolicyAll &&
 		job.Spec.CleanPodPolicy != div1alpha1.CleanPodPolicyRunning {
 		return nil
 	}

controllers/dijob_test.go

@@ -20,7 +20,7 @@ var _ = Describe("DIJob Specification", func() {
 	Context("When creating a DIJob with different CleanPodPolicy", func() {
 		It("Should execute different pods deletion policy with different CleanPodPolicy", func() {
 			cleanPodPolicies := []div1alpha1.CleanPodPolicy{
-				div1alpha1.CleanPodPolicyALL,
+				div1alpha1.CleanPodPolicyAll,
 				div1alpha1.CleanPodPolicyRunning,
 				div1alpha1.CleanPodPolicyNone,
 			}
@@ -116,7 +116,7 @@ var _ = Describe("DIJob Specification", func() {
 					By("Checking all the pods and services are deleted")
 
 					switch policy {
-					case div1alpha1.CleanPodPolicyALL:
+					case div1alpha1.CleanPodPolicyAll:
 						Eventually(func() int {
 							pods, err := diutil.ListPods(ctx, k8sClient, &dijob)
 							if err != nil {

server/http/server_test.go

@@ -408,22 +408,6 @@ var _ = Describe("Server Test", func() {
 					Expect(portCount).Should(Equal(c.expectedDDPLPorts))
 				}
 
-				By("Send request on DELETE /v1alpha1/replicas")
-				var dln int = 1
-				dreq := commontypes.DIJobRequest{
-					Namespace:   job.Namespace,
-					Coordinator: coorname,
-					Learners: commontypes.ResourceQuantity{
-						Replicas: dln,
-					},
-				}
-				drbody, err := json.Marshal(dreq)
-				Expect(err).NotTo(HaveOccurred())
-
-				ddiresp, err := sendRequest(http.MethodDelete, drbody, rurl, http.StatusOK, true)
-				Expect(err).NotTo(HaveOccurred())
-				Expect(len(ddiresp.Learners)).Should(Equal(dln))
-
 				err = testutil.CleanUpJob(ctx, k8sClient, job.DeepCopy())
 				Expect(err).NotTo(HaveOccurred())
 			}