Add analysis to experiment

argoproj · Oct 29, 2019 · 26f77e6 · 26f77e6
1 parent 1486519
commit 26f77e6
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 3 deletions.
diff --git a/manifests/crds/rollout-crd.yaml b/manifests/crds/rollout-crd.yaml
@@ -172,6 +172,29 @@ spec:
                             type: object
                           experiment:
                             properties:
+                              analysis:
+                                properties:
+                                  arguments:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                        valueFrom:
+                                          properties:
+                                            podTemplateHashValue:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                  templateName:
+                                    type: string
+                                required:
+                                - templateName
+                                type: object
                               duration:
                                 format: int32
                                 type: integer

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -7899,6 +7899,29 @@ spec:
                             type: object
                           experiment:
                             properties:
+                              analysis:
+                                properties:
+                                  arguments:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                        valueFrom:
+                                          properties:
+                                            podTemplateHashValue:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                  templateName:
+                                    type: string
+                                required:
+                                - templateName
+                                type: object
                               duration:
                                 format: int32
                                 type: integer

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -7899,6 +7899,29 @@ spec:
                             type: object
                           experiment:
                             properties:
+                              analysis:
+                                properties:
+                                  arguments:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                        valueFrom:
+                                          properties:
+                                            podTemplateHashValue:
+                                              type: string
+                                          type: object
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                  templateName:
+                                    type: string
+                                required:
+                                - templateName
+                                type: object
                               duration:
                                 format: int32
                                 type: integer

diff --git a/pkg/apis/rollouts/v1alpha1/openapi_generated.go b/pkg/apis/rollouts/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/rollouts/v1alpha1/types.go b/pkg/apis/rollouts/v1alpha1/types.go
@@ -152,7 +152,8 @@ type RolloutExperimentStep struct {
 	Duration int32 `json:"duration"`
 	// Templates what templates that should be added to the experiment. Should be non-nil
 	Templates []RolloutExperimentTemplate `json:"templates"`
-	//ProgressingDeadlineSeconds Is it ncessary?
+	//AnalysisTemplate what analysis to run with the experiment
+	Analysis *RolloutAnalysisStep `json:"analysis,omitempty"`
 }
 
 // RolloutExperimentTemplate defines the template used to create experiments for the Rollout's experiment canary step

diff --git a/pkg/apis/rollouts/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/rollouts/v1alpha1/zz_generated.deepcopy.go
diff --git a/rollout/experiment.go b/rollout/experiment.go
@@ -12,6 +12,7 @@ import (
 	"k8s.io/utils/pointer"
 
 	"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
+	analysisutil "github.com/argoproj/argo-rollouts/utils/analysis"
 	"github.com/argoproj/argo-rollouts/utils/defaults"
 	experimentutil "github.com/argoproj/argo-rollouts/utils/experiment"
 	replicasetutil "github.com/argoproj/argo-rollouts/utils/replicaset"
@@ -77,6 +78,17 @@ func GetExperimentFromTemplate(r *v1alpha1.Rollout, stableRS, newRS *appsv1.Repl
 		experiment.Spec.Templates = append(experiment.Spec.Templates, template)
 	}
 
+	if step.Analysis != nil {
+		args := analysisutil.BuildArgumentsForRolloutAnalysisRun(step.Analysis, stableRS, newRS)
+		analysis := step.Analysis
+		analysisTemplate := v1alpha1.ExperimentAnalysisTemplateRef{
+			Name:         analysis.TemplateName,
+			TemplateName: analysis.TemplateName,
+			Arguments:    args,
+		}
+		experiment.Spec.Analyses = append(experiment.Spec.Analyses, analysisTemplate)
+	}
+
 	return experiment, nil
 }
 

diff --git a/rollout/experiment_test.go b/rollout/experiment_test.go
@@ -18,13 +18,17 @@ func TestRolloutCreateExperiment(t *testing.T) {
 	f := newFixture(t)
 	defer f.Close()
 
+	at := analysisTemplate("bar")
 	steps := []v1alpha1.CanaryStep{{
 		Experiment: &v1alpha1.RolloutExperimentStep{
 			Templates: []v1alpha1.RolloutExperimentTemplate{{
 				Name:     "stable-template",
 				SpecRef:  v1alpha1.StableSpecRef,
 				Replicas: int32(1),
 			}},
+			Analysis: &v1alpha1.RolloutAnalysisStep{
+				TemplateName: at.Name,
+			},
 		},
 	}}
 
@@ -49,6 +53,7 @@ func TestRolloutCreateExperiment(t *testing.T) {
 	f.run(getKey(r2, t))
 	createdEx := f.getCreatedExperiment(createExIndex)
 	assert.Equal(t, createdEx.GenerateName, ex.GenerateName)
+	assert.Equal(t, createdEx.Spec.Analyses[0].TemplateName, at.Name)
 	patch := f.getPatchedRollout(patchIndex)
 	expectedPatch := `{
 		"status": {