feat: support scaleDownDelaySeconds in canary w/ traffic routing (#1056)

* chore: simplify syncRolloutStatusCanary logic * refactor: simplify and consolidate bluegreen/canary sync logic Signed-off-by: Jesse Suen <[email protected]>
argoproj · Apr 19, 2021 · 31afa28 · 31afa28
1 parent 0c9f9a5
commit 31afa28
Show file tree

Hide file tree

Showing 35 changed files with 1,238 additions and 644 deletions.
diff --git a/Makefile b/Makefile
@@ -191,7 +191,7 @@ lint:
 	golangci-lint run --fix
 
 .PHONY: test
-test: test-kustomize
+test:
 	go test -covermode=count -coverprofile=coverage.out ${TEST_TARGET}
 
 .PHONY: test-kustomize
@@ -204,7 +204,7 @@ start-e2e:
 
 .PHONY: test-e2e
 test-e2e:
-	go test -timeout 15m -v -count 1 --tags e2e -p ${E2E_PARALLEL} --short ./test/e2e ${E2E_TEST_OPTIONS}
+	go test -timeout 20m -v -count 1 --tags e2e -p ${E2E_PARALLEL} --short ./test/e2e ${E2E_TEST_OPTIONS}
 
 .PHONY: coverage
 coverage: test

diff --git a/go.mod b/go.mod
@@ -37,6 +37,7 @@ require (
 	google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a
 	google.golang.org/grpc v1.33.1
 	google.golang.org/grpc/examples v0.0.0-20210331235824-f6bb3972ed15 // indirect
+	google.golang.org/protobuf v1.25.0
 	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 	k8s.io/api v0.20.4

diff --git a/manifests/crds/rollout-crd.yaml b/manifests/crds/rollout-crd.yaml
@@ -296,6 +296,12 @@ spec:
                         - type: integer
                         - type: string
                         x-kubernetes-int-or-string: true
+                      scaleDownDelayRevisionLimit:
+                        format: int32
+                        type: integer
+                      scaleDownDelaySeconds:
+                        format: int32
+                        type: integer
                       stableMetadata:
                         properties:
                           annotations:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -9987,6 +9987,12 @@ spec:
                         - type: integer
                         - type: string
                         x-kubernetes-int-or-string: true
+                      scaleDownDelayRevisionLimit:
+                        format: int32
+                        type: integer
+                      scaleDownDelaySeconds:
+                        format: int32
+                        type: integer
                       stableMetadata:
                         properties:
                           annotations:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -9987,6 +9987,12 @@ spec:
                         - type: integer
                         - type: string
                         x-kubernetes-int-or-string: true
+                      scaleDownDelayRevisionLimit:
+                        format: int32
+                        type: integer
+                      scaleDownDelaySeconds:
+                        format: int32
+                        type: integer
                       stableMetadata:
                         properties:
                           annotations:

diff --git a/pkg/apiclient/rollout/rollout.pb.go b/pkg/apiclient/rollout/rollout.pb.go