Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/argoproj/argo-rollouts in…
Browse files Browse the repository at this point in the history 
…to exp-collision-naming
  • Loading branch information
@khhirani
khhirani committed Nov 15, 2021
2 parents 8788920 + cac717c commit d9c62f8
Show file tree
Hide file tree
Showing 16 changed files with 2,075 additions and 133 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DEV_IMAGE=false
# E2E variables
E2E_INSTANCE_ID ?= argo-rollouts-e2e
E2E_TEST_OPTIONS ?=
E2E_PARALLEL ?= 1
E2E_PARALLEL ?= 4

override LDFLAGS += \
-X ${PACKAGE}/utils/version.version=${VERSION} \
Expand Down Expand Up @@ -244,7 +244,7 @@ start-e2e:

.PHONY: test-e2e
test-e2e:
go test -timeout 20m -v -count 1 --tags e2e -p ${E2E_PARALLEL} --short ./test/e2e ${E2E_TEST_OPTIONS}
go test -timeout 30m -v -count 1 --tags e2e -p ${E2E_PARALLEL} --short ./test/e2e ${E2E_TEST_OPTIONS}

.PHONY: coverage
coverage: test
Expand Down
3 changes: 0 additions & 3 deletions docs/features/controller-metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,16 @@ The Argo Rollouts controller publishes the following prometheus metrics about Ar
| Name | Description |
| ----------------------------------- | ----------- |
| `rollout_created_time` | Creation time in unix timestamp for an rollout. |
| `rollout_info` | Information about rollout. |
| `rollout_info_replicas_available` | The number of available replicas per rollout. |
| `rollout_info_replicas_unavailable` | The number of unavailable replicas per rollout. |
| `rollout_phase` | Information on the state of the rollout. |
| `rollout_reconcile` | Rollout reconciliation performance. |
| `rollout_reconcile_error` | Error occurring during the rollout. |
| `experiment_created_time` | Creation time in unix timestamp for an experiment. |
| `experiment_info` | Information about Experiment. |
| `experiment_phase` | Information on the state of the experiment. |
| `experiment_reconcile` | Experiments reconciliation performance. |
| `experiment_reconcile_error` | Error occurring during the experiment. |
| `analysis_run_created_time` | Creation time in unix timestamp for an Analysis Run. |
| `analysis_run_info` | Information about analysis run. |
| `analysis_run_metric_phase` | Information on the duration of a specific metric in the Analysis Run. |
| `analysis_run_metric_type` | Information on the type of a specific metric in the Analysis Runs. |
Expand Down
36 changes: 36 additions & 0 deletions docs/features/kustomize/rollout_cr_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -716,6 +720,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -921,6 +929,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -1424,6 +1436,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -1560,6 +1576,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -1765,6 +1785,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -2303,6 +2327,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -2444,6 +2472,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down Expand Up @@ -2649,6 +2681,10 @@
],
"type": "object"
},
"terminationGracePeriodSeconds": {
"format": "int64",
"type": "integer"
},
"timeoutSeconds": {
"format": "int32",
"type": "integer"
Expand Down
74 changes: 36 additions & 38 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ require (
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.5.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.6.1
github.com/blang/semver v3.5.1+incompatible
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/evanphx/json-patch/v5 v5.2.0
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-openapi/spec v0.19.3
github.com/go-openapi/spec v0.19.5
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.4.4
github.com/golang/protobuf v1.4.3
Expand All @@ -37,55 +36,54 @@ require (
github.com/tj/assert v0.0.3
github.com/undefinedlabs/go-mpatch v1.0.6
github.com/valyala/fasttemplate v1.2.1
golang.org/x/tools v0.1.0 // indirect
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.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/api v0.20.4
k8s.io/apiextensions-apiserver v0.19.4
k8s.io/apimachinery v0.20.4
k8s.io/apiserver v0.20.4
k8s.io/cli-runtime v0.20.4
k8s.io/client-go v0.20.4
k8s.io/code-generator v0.20.4
k8s.io/component-base v0.20.4
k8s.io/klog/v2 v2.5.0
k8s.io/kube-openapi v0.0.0-20210216185858-15cd8face8d6
k8s.io/kubectl v0.19.4
k8s.io/kubernetes v1.20.4
k8s.io/api v0.21.0
k8s.io/apiextensions-apiserver v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/apiserver v0.21.0
k8s.io/cli-runtime v0.21.0
k8s.io/client-go v0.21.0
k8s.io/code-generator v0.21.0
k8s.io/component-base v0.21.0
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
k8s.io/kubectl v0.21.0
k8s.io/kubernetes v1.21.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)

replace (
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0
k8s.io/api => k8s.io/api v0.20.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0-alpha.0
k8s.io/apiserver => k8s.io/apiserver v0.20.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.4
k8s.io/client-go => k8s.io/client-go v0.20.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.4
k8s.io/api => k8s.io/api v0.21.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
k8s.io/apiserver => k8s.io/apiserver v0.21.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
k8s.io/client-go => k8s.io/client-go v0.21.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
k8s.io/code-generator => k8s.io/code-generator v0.20.5-rc.0
k8s.io/component-base => k8s.io/component-base v0.20.4
k8s.io/component-helpers => k8s.io/component-helpers v0.20.4
k8s.io/controller-manager => k8s.io/controller-manager v0.20.4
k8s.io/component-base => k8s.io/component-base v0.21.0
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
k8s.io/cri-api => k8s.io/cri-api v0.20.5-rc.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.4
k8s.io/kubectl => k8s.io/kubectl v0.20.4
k8s.io/kubelet => k8s.io/kubelet v0.20.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.4
k8s.io/metrics => k8s.io/metrics v0.20.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
k8s.io/kubectl => k8s.io/kubectl v0.21.0
k8s.io/kubelet => k8s.io/kubelet v0.21.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
k8s.io/metrics => k8s.io/metrics v0.21.0
k8s.io/mount-utils => k8s.io/mount-utils v0.20.5-rc.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.4
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.4
k8s.io/sample-controller => k8s.io/sample-controller v0.20.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
)
Loading

0 comments on commit d9c62f8

Please sign in to comment.