From 966c17a428f869c3352090b6bd00dc4f876c1a30 Mon Sep 17 00:00:00 2001 From: Aaron Weisberg Date: Mon, 31 Aug 2020 14:19:39 -0700 Subject: [PATCH] updates rollout crd --- .../templates/crds/rollout-crd.yaml | 165 +++++++++++------- 1 file changed, 100 insertions(+), 65 deletions(-) diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml index 0f276b16..9ed9a8d6 100644 --- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml +++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml @@ -1,4 +1,3 @@ -{{- if .Values.installCRDs }} apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -16,13 +15,11 @@ spec: name: Current type: integer - JSONPath: .status.updatedReplicas - description: Total number of non-terminated pods targeted by this rollout that - have the desired template spec + description: Total number of non-terminated pods targeted by this rollout that have the desired template spec name: Up-to-date type: integer - JSONPath: .status.availableReplicas - description: Total number of available pods (ready for at least minReadySeconds) - targeted by this rollout + description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout name: Available type: integer group: argoproj.io @@ -132,15 +129,17 @@ spec: - name type: object type: array + clusterScope: + type: boolean templateName: type: string templates: items: properties: + clusterScope: + type: boolean templateName: type: string - required: - - templateName type: object type: array type: object @@ -162,15 +161,17 @@ spec: - name type: object type: array + clusterScope: + type: boolean templateName: type: string templates: items: properties: + clusterScope: + type: boolean templateName: type: string - required: - - templateName type: object type: array type: object @@ -208,6 +209,8 @@ spec: - name type: object type: array + clusterScope: + type: boolean startingStep: format: int32 type: integer @@ -216,10 +219,10 @@ spec: templates: items: properties: + clusterScope: + type: boolean templateName: type: string - required: - - templateName type: object type: array type: object @@ -271,15 +274,17 @@ spec: - name type: object type: array + clusterScope: + type: boolean templateName: type: string templates: items: properties: + clusterScope: + type: boolean templateName: type: string - required: - - templateName type: object type: array type: object @@ -304,6 +309,8 @@ spec: - name type: object type: array + clusterScope: + type: boolean name: type: string templateName: @@ -375,6 +382,17 @@ spec: - type: string x-kubernetes-int-or-string: true type: object + setCanaryScale: + properties: + matchTrafficWeight: + type: boolean + replicas: + format: int32 + type: integer + weight: + format: int32 + type: integer + type: object setWeight: format: int32 type: integer @@ -388,6 +406,8 @@ spec: type: string ingress: type: string + rootService: + type: string servicePort: format: int32 type: integer @@ -425,12 +445,28 @@ spec: required: - stableIngress type: object + smi: + properties: + rootService: + type: string + trafficSplitName: + type: string + type: object type: object type: object type: object template: properties: metadata: + properties: + annotations: + additionalProperties: + type: string + type: object + labels: + additionalProperties: + type: string + type: object type: object spec: properties: @@ -1052,23 +1088,6 @@ spec: type: integer type: object resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object type: object securityContext: properties: @@ -1608,23 +1627,6 @@ spec: type: integer type: object resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object type: object securityContext: properties: @@ -2168,23 +2170,6 @@ spec: type: integer type: object resources: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object type: object securityContext: properties: @@ -2935,6 +2920,9 @@ spec: type: integer abort: type: boolean + abortedAt: + format: date-time + type: string availableReplicas: format: int32 type: integer @@ -2944,8 +2932,32 @@ spec: type: string postPromotionAnalysisRun: type: string + postPromotionAnalysisRunStatus: + properties: + message: + type: string + name: + type: string + status: + type: string + required: + - name + - status + type: object prePromotionAnalysisRun: type: string + prePromotionAnalysisRunStatus: + properties: + message: + type: string + name: + type: string + status: + type: string + required: + - name + - status + type: object previewSelector: type: string previousActiveSelector: @@ -2960,10 +2972,34 @@ spec: properties: currentBackgroundAnalysisRun: type: string + currentBackgroundAnalysisRunStatus: + properties: + message: + type: string + name: + type: string + status: + type: string + required: + - name + - status + type: object currentExperiment: type: string currentStepAnalysisRun: type: string + currentStepAnalysisRunStatus: + properties: + message: + type: string + name: + type: string + status: + type: string + required: + - name + - status + type: object stableRS: type: string type: object @@ -3045,4 +3081,3 @@ spec: - name: v1alpha1 served: true storage: true -{{- end }}