Initial integration with experiments and analysis

Makefile

@@ -80,7 +80,7 @@ lint:
 
 .PHONY: test
 test:
-	go test -failfast -covermode=count -coverprofile=coverage.out `go list ./...`
+	go test -failfast -covermode=count -coverprofile=coverage.out `go list ./... | grep -v github.com/argoproj/argo-rollouts/pkg/client`
 
 .PHONY: mocks
 mocks:

docs/features/analysis.md

@@ -292,7 +292,7 @@ kind: Experiment
 name:
   name: guestbook-6c54544bf9-0
 spec:
-  durationSeconds: 3600
+  duration: 3600
   templates:
   - name: baseline
     replicas: 1

docs/features/rollout.yaml

@@ -19,7 +19,7 @@ spec:
   minReadySeconds: 30
   # The number of old ReplicaSets to retain. If unspecified, will retain 10 old ReplicaSets
   revisionHistoryLimit: 3
-  # Indiciates if the rollout is paused
+  # Indicates if the rollout is paused
   paused: false
   # The maximum time in seconds for a rollout to make progress before it is considered to be failed. Argo Rollouts will continue to process failed rollouts and a condition with a ProgressDeadlineExceeded reason will be surfaced in the rollout status. Note that progress will not be estimated during the time a rollout is paused. Defaults to 600s.
   progressDeadlineSeconds: 600
@@ -54,4 +54,10 @@ spec:
           duration: 3600 # One hour
       - setWeight: 40
       # Sets .spec.paused to true and waits until the field is changed back
-      - pause: {}  
+      - pause: {}
+status:
+  pauseConditions:
+  - reason: StepPause
+    startTime: 2019-10-00T1234
+  - reason: BlueGreenPause
+  - reason: AnalysisRunInconclusive

experiments/conditions_test.go

@@ -12,8 +12,6 @@ import (
 )
 
 func TestUpdateProgressingLastUpdateTime(t *testing.T) {
-	f := newFixture(t)
-	defer f.Close()
 
 	templates := generateTemplates("bar")
 	templates[0].Replicas = pointer.Int32Ptr(2)
@@ -29,11 +27,10 @@ func TestUpdateProgressingLastUpdateTime(t *testing.T) {
 		*prevCond,
 	}
 
-	f.experimentLister = append(f.experimentLister, e)
-	f.objects = append(f.objects, e)
 	rs := templateToRS(e, templates[0], 1)
-	f.replicaSetLister = append(f.replicaSetLister, rs)
-	f.kubeobjects = append(f.kubeobjects, rs)
+
+	f := newFixture(t, e, rs)
+	defer f.Close()
 
 	patchIndex := f.expectPatchExperimentAction(e)
 
@@ -49,9 +46,6 @@ func TestUpdateProgressingLastUpdateTime(t *testing.T) {
 }
 
 func TestEnterTimeoutDegradedState(t *testing.T) {
-	f := newFixture(t)
-	defer f.Close()
-
 	templates := generateTemplates("bar")
 	e := newExperiment("foo", templates, nil, pointer.BoolPtr(true))
 	e.Status.TemplateStatuses = []v1alpha1.TemplateStatus{{
@@ -66,11 +60,9 @@ func TestEnterTimeoutDegradedState(t *testing.T) {
 		*prevCond,
 	}
 
-	f.experimentLister = append(f.experimentLister, e)
-	f.objects = append(f.objects, e)
 	rs := templateToRS(e, templates[0], 0)
-	f.replicaSetLister = append(f.replicaSetLister, rs)
-	f.kubeobjects = append(f.kubeobjects, rs)
+	f := newFixture(t, e, rs)
+	defer f.Close()
 
 	patchIndex := f.expectPatchExperimentAction(e)
 

experiments/controller.go

@@ -231,21 +231,17 @@ func (ec *ExperimentController) syncHandler(key string) error {
 		return err
 	}
 
-	exCtx := experimentContext{
-		log:                    logCtx,
-		ex:                     experiment,
-		templateRSs:            templateRSs,
-		kubeclientset:          ec.kubeclientset,
-		argoProjClientset:      ec.argoProjClientset,
-		replicaSetLister:       ec.replicaSetLister,
-		recorder:               ec.recorder,
-		enqueueExperimentAfter: ec.enqueueExperimentAfter,
-	}
+	exCtx := newExperimentContext(
+		experiment,
+		templateRSs,
+		ec.kubeclientset,
+		ec.argoProjClientset,
+		ec.replicaSetLister,
+		ec.recorder,
+		ec.enqueueExperimentAfter,
+	)
 
-	newStatus, err := exCtx.reconcile()
-	if err != nil {
-		return err
-	}
+	newStatus := exCtx.reconcile()
 	return ec.persistExperimentStatus(experiment, newStatus)
 }
 

experiments/controller_test.go

@@ -65,11 +65,23 @@ type fixture struct {
 	unfreezeTime    func()
 }
 
-func newFixture(t *testing.T) *fixture {
+func newFixture(t *testing.T, objects ...runtime.Object) *fixture {
 	f := &fixture{}
 	f.t = t
 	f.objects = []runtime.Object{}
 	f.kubeobjects = []runtime.Object{}
+	for _, obj := range objects {
+		switch obj.(type) {
+		case *v1alpha1.Experiment:
+			f.objects = append(f.objects, obj)
+			f.experimentLister = append(f.experimentLister, obj.(*v1alpha1.Experiment))
+		case *appsv1.ReplicaSet:
+			f.kubeobjects = append(f.kubeobjects, obj)
+			f.replicaSetLister = append(f.replicaSetLister, obj.(*appsv1.ReplicaSet))
+		}
+	}
+	f.client = fake.NewSimpleClientset(f.objects...)
+	f.kubeclient = k8sfake.NewSimpleClientset(f.kubeobjects...)
 	f.enqueuedObjects = make(map[string]int)
 	now := time.Now()
 	patch := monkey.Patch(time.Now, func() time.Time { return now })
@@ -284,9 +296,6 @@ func getKey(experiment *v1alpha1.Experiment, t *testing.T) string {
 type resyncFunc func() time.Duration
 
 func (f *fixture) newController(resync resyncFunc) (*ExperimentController, informers.SharedInformerFactory, kubeinformers.SharedInformerFactory) {
-	f.client = fake.NewSimpleClientset(f.objects...)
-	f.kubeclient = k8sfake.NewSimpleClientset(f.kubeobjects...)
-
 	i := informers.NewSharedInformerFactory(f.client, resync())
 	k8sI := kubeinformers.NewSharedInformerFactory(f.kubeclient, resync())
 
@@ -593,15 +602,12 @@ func validatePatch(t *testing.T, patch string, running *bool, availableleAt avai
 }
 
 func TestAddInvalidSpec(t *testing.T) {
-	f := newFixture(t)
-	defer f.Close()
-
 	templates := generateTemplates("bar", "baz")
 	e := newExperiment("foo", templates, nil, pointer.BoolPtr(true))
 	e.Spec.Templates[0].Name = ""
 
-	f.experimentLister = append(f.experimentLister, e)
-	f.objects = append(f.objects, e)
+	f := newFixture(t, e)
+	defer f.Close()
 
 	patchIndex := f.expectPatchExperimentAction(e)
 	f.run(getKey(e, t))
@@ -617,9 +623,6 @@ func TestAddInvalidSpec(t *testing.T) {
 }
 
 func TestKeepInvalidSpec(t *testing.T) {
-	f := newFixture(t)
-	defer f.Close()
-
 	templates := generateTemplates("bar", "baz")
 	e := newExperiment("foo", templates, nil, pointer.BoolPtr(true))
 	e.Status.Conditions = []v1alpha1.ExperimentCondition{{
@@ -630,17 +633,14 @@ func TestKeepInvalidSpec(t *testing.T) {
 	}}
 	e.Spec.Templates[0].Name = ""
 
-	f.experimentLister = append(f.experimentLister, e)
-	f.objects = append(f.objects, e)
+	f := newFixture(t, e)
+	defer f.Close()
 
 	f.run(getKey(e, t))
 
 }
 
 func TestUpdateInvalidSpec(t *testing.T) {
-	f := newFixture(t)
-	defer f.Close()
-
 	templates := generateTemplates("bar", "baz")
 	e := newExperiment("foo", templates, nil, pointer.BoolPtr(true))
 
@@ -653,8 +653,8 @@ func TestUpdateInvalidSpec(t *testing.T) {
 
 	e.Spec.Templates[0].Name = ""
 
-	f.experimentLister = append(f.experimentLister, e)
-	f.objects = append(f.objects, e)
+	f := newFixture(t, e)
+	defer f.Close()
 
 	patchIndex := f.expectPatchExperimentAction(e)
 	f.run(getKey(e, t))
@@ -671,9 +671,6 @@ func TestUpdateInvalidSpec(t *testing.T) {
 }
 
 func TestRemoveInvalidSpec(t *testing.T) {
-	f := newFixture(t)
-	defer f.Close()
-
 	templates := generateTemplates("bar", "baz")
 	e := newExperiment("foo", templates, nil, pointer.BoolPtr(true))
 
@@ -683,8 +680,8 @@ func TestRemoveInvalidSpec(t *testing.T) {
 		Reason: conditions.InvalidSpecReason,
 	}}
 
-	f.experimentLister = append(f.experimentLister, e)
-	f.objects = append(f.objects, e)
+	f := newFixture(t, e)
+	defer f.Close()
 
 	createFirstRSIndex := f.expectCreateReplicaSetAction(templateToRS(e, templates[0], 0))
 	createSecondRSIndex := f.expectCreateReplicaSetAction(templateToRS(e, templates[1], 0))