From d6ec86fb65d48d04140282e2921b8ef5cb1a918e Mon Sep 17 00:00:00 2001 From: Amrit Gill Date: Thu, 14 Oct 2021 10:58:00 -0400 Subject: [PATCH] chore: update rollouts to v1.1.0 (#966) * chore: add changelog Signed-off-by: agill17 * fix(argo-cd): Use correct chart icon url (#964) Signed-off-by: Marco Kilchhofer Signed-off-by: agill17 Co-authored-by: Marco Kilchhofer --- charts/argo-rollouts/Chart.yaml | 6 +- .../templates/crds/analysis-run-crd.yaml | 60 ++++++++++ .../templates/crds/analysis-template-crd.yaml | 60 ++++++++++ .../crds/cluster-analysis-template-crd.yaml | 60 ++++++++++ .../templates/crds/experiment-crd.yaml | 9 ++ .../templates/crds/rollout-crd.yaml | 110 +++++++++++++++++- 6 files changed, 299 insertions(+), 6 deletions(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index a71abd6b..7304f35b 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "v1.0.2" +appVersion: "v1.1.0" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 2.1.1 +version: 2.2.0 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png home: https://github.com/argoproj/argo-helm maintainers: @@ -11,4 +11,4 @@ maintainers: - name: jessesuen annotations: artifacthub.io/changes: | - - "[Added]: Two separate tests. One for default values and one for dashboard enabled." + - "[Changed]: updated rollouts version to 1.1.0 and updated CRDs to reflect the version bump" diff --git a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml index 1ed7df98..42496b96 100644 --- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml @@ -107,6 +107,59 @@ spec: type: string provider: properties: + cloudWatch: + properties: + interval: + type: string + metricDataQueries: + items: + properties: + expression: + type: string + id: + type: string + label: + type: string + metricStat: + properties: + metric: + properties: + dimensions: + items: + properties: + name: + type: string + value: + type: string + type: object + type: array + metricName: + type: string + namespace: + type: string + type: object + period: + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + stat: + type: string + unit: + type: string + type: object + period: + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + returnData: + type: boolean + type: object + type: array + required: + - metricDataQueries + type: object datadog: properties: interval: @@ -116,6 +169,13 @@ spec: required: - query type: object + graphite: + properties: + address: + type: string + query: + type: string + type: object job: properties: metadata: diff --git a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml index 85eafd38..f81efd4d 100644 --- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml @@ -102,6 +102,59 @@ spec: type: string provider: properties: + cloudWatch: + properties: + interval: + type: string + metricDataQueries: + items: + properties: + expression: + type: string + id: + type: string + label: + type: string + metricStat: + properties: + metric: + properties: + dimensions: + items: + properties: + name: + type: string + value: + type: string + type: object + type: array + metricName: + type: string + namespace: + type: string + type: object + period: + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + stat: + type: string + unit: + type: string + type: object + period: + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + returnData: + type: boolean + type: object + type: array + required: + - metricDataQueries + type: object datadog: properties: interval: @@ -111,6 +164,13 @@ spec: required: - query type: object + graphite: + properties: + address: + type: string + query: + type: string + type: object job: properties: metadata: diff --git a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml index 76866712..d8435bda 100644 --- a/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml @@ -102,6 +102,59 @@ spec: type: string provider: properties: + cloudWatch: + properties: + interval: + type: string + metricDataQueries: + items: + properties: + expression: + type: string + id: + type: string + label: + type: string + metricStat: + properties: + metric: + properties: + dimensions: + items: + properties: + name: + type: string + value: + type: string + type: object + type: array + metricName: + type: string + namespace: + type: string + type: object + period: + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + stat: + type: string + unit: + type: string + type: object + period: + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + returnData: + type: boolean + type: object + type: array + required: + - metricDataQueries + type: object datadog: properties: interval: @@ -111,6 +164,13 @@ spec: required: - query type: object + graphite: + properties: + address: + type: string + query: + type: string + type: object job: properties: metadata: diff --git a/charts/argo-rollouts/templates/crds/experiment-crd.yaml b/charts/argo-rollouts/templates/crds/experiment-crd.yaml index 7965030a..634b03f3 100644 --- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml +++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml @@ -95,6 +95,9 @@ spec: progressDeadlineSeconds: format: int32 type: integer + scaleDownDelaySeconds: + format: int32 + type: integer templates: items: properties: @@ -129,6 +132,8 @@ spec: type: string type: object type: object + service: + type: object template: properties: metadata: @@ -2316,12 +2321,16 @@ spec: type: string name: type: string + podTemplateHash: + type: string readyReplicas: format: int32 type: integer replicas: format: int32 type: integer + serviceName: + type: string status: type: string updatedReplicas: diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml index 748d5897..cbde1256 100644 --- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml +++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml @@ -57,11 +57,22 @@ spec: type: object spec: properties: + analysis: + properties: + successfulRunHistoryLimit: + format: int32 + type: integer + unsuccessfulRunHistoryLimit: + format: int32 + type: integer + type: object minReadySeconds: format: int32 type: integer paused: type: boolean + progressDeadlineAbort: + type: boolean progressDeadlineSeconds: format: int32 type: integer @@ -101,6 +112,9 @@ spec: properties: blueGreen: properties: + abortScaleDownDelaySeconds: + format: int32 + type: integer activeMetadata: properties: annotations: @@ -234,6 +248,9 @@ spec: type: object canary: properties: + abortScaleDownDelaySeconds: + format: int32 + type: integer analysis: properties: args: @@ -298,6 +315,8 @@ spec: type: object canaryService: type: string + dynamicStableScale: + type: boolean maxSurge: anyOf: - type: integer @@ -452,6 +471,9 @@ spec: type: object specRef: type: string + weight: + format: int32 + type: integer required: - name - specRef @@ -533,12 +555,46 @@ spec: items: type: string type: array + tlsRoutes: + items: + properties: + port: + format: int64 + type: integer + sniHosts: + items: + type: string + type: array + type: object + type: array required: - name - - routes type: object - required: - - virtualService + virtualServices: + items: + properties: + name: + type: string + routes: + items: + type: string + type: array + tlsRoutes: + items: + properties: + port: + format: int64 + type: integer + sniHosts: + items: + type: string + type: array + type: object + type: array + required: + - name + type: object + type: array type: object nginx: properties: @@ -2755,6 +2811,52 @@ spec: - name - status type: object + weights: + properties: + additional: + items: + properties: + podTemplateHash: + type: string + serviceName: + type: string + weight: + format: int32 + type: integer + required: + - weight + type: object + type: array + canary: + properties: + podTemplateHash: + type: string + serviceName: + type: string + weight: + format: int32 + type: integer + required: + - weight + type: object + stable: + properties: + podTemplateHash: + type: string + serviceName: + type: string + weight: + format: int32 + type: integer + required: + - weight + type: object + verified: + type: boolean + required: + - canary + - stable + type: object type: object collisionCount: format: int32 @@ -2831,6 +2933,8 @@ spec: updatedReplicas: format: int32 type: integer + workloadObservedGeneration: + type: string type: object required: - spec