From 4f4c3af0c2dbbff5b1373fac453a0ae7e7ae5e4d Mon Sep 17 00:00:00 2001 From: Scott Cabrinha Date: Wed, 25 Mar 2020 09:29:44 -0700 Subject: [PATCH] feat: add imagePullSecrets, labels, annotations and update CRDs (#268) * feat: add imagePullSecrets, labels, annotations and update CRDs * remove global value * keep templated labels * Update charts/argo-rollouts/Chart.yaml update minor version, not just patch Co-Authored-By: Eytan Hanig * Update charts/argo-rollouts/README.md Co-Authored-By: Eytan Hanig Co-authored-by: Eytan Hanig --- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/README.md | 5 +- .../templates/argo-rollouts-clusterrole.yaml | 18 ++ .../templates/argo-rollouts-deployment.yaml | 13 + .../templates/crds/analysis-run-crd.yaml | 188 ++++++++++--- .../templates/crds/analysis-template-crd.yaml | 188 ++++++++++--- .../templates/crds/experiment-crd.yaml | 186 ++++++++++--- .../templates/crds/rollout-crd.yaml | 254 +++++++++++++++--- charts/argo-rollouts/values.yaml | 10 + 9 files changed, 714 insertions(+), 150 deletions(-) diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index 175d2c86..f62ffce9 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/charts/argo-rollouts/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.7" description: A Helm chart for Argo Rollouts name: argo-rollouts -version: 0.1.1 +version: 0.2.0 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md index f4f0f3a6..5ddeb0b6 100644 --- a/charts/argo-rollouts/README.md +++ b/charts/argo-rollouts/README.md @@ -2,7 +2,7 @@ Argo Rollouts Chart ============= A Helm chart for Argo Rollouts, progressive delivery for Kubernetes. -Current chart version is `0.1.0` +Current chart version is `0.2.0` Source code can be found [here](https://github.com/argoproj/argo-rollouts) @@ -35,5 +35,8 @@ $ helm install --name my-release argo/argo-rollouts | controller.image.repository | string | `"argoproj/argo-rollouts"` | | | controller.image.tag | string | `"v0.7.0"` | | | controller.name | string | `"argo-rollouts"` | | +| imagePullSecrets | list | `[]` | | | installCRDs | bool | `true` | | +| podAnnotations | object | `{}` | | +| podLabels | object | `{}` | | | serviceAccount.name | string | `"argo-rollouts"` | | diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml index daced75e..43526d58 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml @@ -29,6 +29,14 @@ rules: - list - watch - patch +- apiGroups: + - "" + resources: + - secrets + verbs: + - get + - list + - watch - apiGroups: - argoproj.io resources: @@ -72,6 +80,16 @@ rules: - update - patch - delete +- apiGroups: + - extensions + resources: + - ingresses + verbs: + - create + - get + - list + - watch + - patch - apiGroups: - "" resources: diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml index b916f8d4..1fb1a2d2 100644 --- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml +++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml @@ -2,10 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Release.Name }} + {{- if .Values.podAnnotations }} + annotations: + {{- range $key, $value := .Values.podAnnotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} labels: app.kubernetes.io/component: {{ .Values.controller.component }} app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Name }} + {{- if .Values.podLabels }} +{{- toYaml .Values.podLabels | nindent 4 }} + {{- end }} spec: selector: matchLabels: @@ -15,6 +24,10 @@ spec: labels: app.kubernetes.io/name: {{ .Release.Name }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: {{ .Values.serviceAccount.name }} containers: - command: diff --git a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml index 9133e58e..5263d47d 100644 --- a/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-run-crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.2.5 name: analysisruns.argoproj.io spec: additionalPrinterColumns: @@ -14,6 +16,8 @@ spec: kind: AnalysisRun listKind: AnalysisRunList plural: analysisruns + shortNames: + - ar singular: analysisrun scope: Namespaced subresources: {} @@ -35,6 +39,19 @@ spec: type: string value: type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + required: + - key + - name + type: object + type: object required: - name type: object @@ -425,7 +442,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -503,8 +524,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -516,8 +538,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -551,8 +574,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -564,8 +588,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -603,8 +628,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -625,8 +651,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -687,8 +714,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -709,8 +737,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -719,6 +748,23 @@ 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: @@ -802,8 +848,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -824,8 +871,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -950,7 +998,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1028,8 +1080,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1041,8 +1094,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1076,8 +1130,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1089,8 +1144,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1128,8 +1184,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1150,8 +1207,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1212,8 +1270,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1234,8 +1293,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1244,6 +1304,23 @@ 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: @@ -1327,8 +1404,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1349,8 +1427,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1479,7 +1558,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1557,8 +1640,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1570,8 +1654,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1605,8 +1690,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1618,8 +1704,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1657,8 +1744,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1679,8 +1767,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1741,8 +1830,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1763,8 +1853,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1773,6 +1864,23 @@ 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: @@ -1856,8 +1964,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1878,8 +1987,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1943,7 +2053,11 @@ spec: type: object overhead: additionalProperties: - type: string + 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 preemptionPolicy: type: string @@ -2194,7 +2308,11 @@ spec: medium: type: string sizeLimit: - type: string + 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 fc: properties: diff --git a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml index 4ad87d94..d88cce46 100644 --- a/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml +++ b/charts/argo-rollouts/templates/crds/analysis-template-crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.2.5 name: analysistemplates.argoproj.io spec: group: argoproj.io @@ -9,6 +11,8 @@ spec: kind: AnalysisTemplate listKind: AnalysisTemplateList plural: analysistemplates + shortNames: + - at singular: analysistemplate scope: Namespaced validation: @@ -29,6 +33,19 @@ spec: type: string value: type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + required: + - key + - name + type: object + type: object required: - name type: object @@ -419,7 +436,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -497,8 +518,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -510,8 +532,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -545,8 +568,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -558,8 +582,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -597,8 +622,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -619,8 +645,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -681,8 +708,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -703,8 +731,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -713,6 +742,23 @@ 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: @@ -796,8 +842,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -818,8 +865,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -944,7 +992,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1022,8 +1074,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1035,8 +1088,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1070,8 +1124,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1083,8 +1138,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1122,8 +1178,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1144,8 +1201,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1206,8 +1264,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1228,8 +1287,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1238,6 +1298,23 @@ 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: @@ -1321,8 +1398,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1343,8 +1421,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1473,7 +1552,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1551,8 +1634,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1564,8 +1648,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1599,8 +1684,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1612,8 +1698,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1651,8 +1738,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1673,8 +1761,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1735,8 +1824,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1757,8 +1847,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1767,6 +1858,23 @@ 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: @@ -1850,8 +1958,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1872,8 +1981,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1937,7 +2047,11 @@ spec: type: object overhead: additionalProperties: - type: string + 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 preemptionPolicy: type: string @@ -2188,7 +2302,11 @@ spec: medium: type: string sizeLimit: - type: string + 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 fc: properties: diff --git a/charts/argo-rollouts/templates/crds/experiment-crd.yaml b/charts/argo-rollouts/templates/crds/experiment-crd.yaml index 23950def..ceaf3b83 100644 --- a/charts/argo-rollouts/templates/crds/experiment-crd.yaml +++ b/charts/argo-rollouts/templates/crds/experiment-crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.2.5 name: experiments.argoproj.io spec: additionalPrinterColumns: @@ -40,6 +42,19 @@ spec: type: string value: type: string + valueFrom: + properties: + secretKeyRef: + properties: + key: + type: string + name: + type: string + required: + - key + - name + type: object + type: object required: - name type: object @@ -412,7 +427,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -490,8 +509,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -503,8 +523,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -538,8 +559,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -551,8 +573,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -590,8 +613,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -612,8 +636,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -674,8 +699,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -696,8 +722,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -706,6 +733,23 @@ 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: @@ -789,8 +833,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -811,8 +856,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -937,7 +983,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1015,8 +1065,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1028,8 +1079,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1063,8 +1115,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1076,8 +1129,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1115,8 +1169,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1137,8 +1192,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1199,8 +1255,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1221,8 +1278,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1231,6 +1289,23 @@ 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: @@ -1314,8 +1389,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1336,8 +1412,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1466,7 +1543,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1544,8 +1625,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1557,8 +1639,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1592,8 +1675,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1605,8 +1689,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1644,8 +1729,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1666,8 +1752,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1728,8 +1815,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1750,8 +1838,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1760,6 +1849,23 @@ 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: @@ -1843,8 +1949,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1865,8 +1972,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1930,7 +2038,11 @@ spec: type: object overhead: additionalProperties: - type: string + 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 preemptionPolicy: type: string @@ -2181,7 +2293,11 @@ spec: medium: type: string sizeLimit: - type: string + 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 fc: properties: diff --git a/charts/argo-rollouts/templates/crds/rollout-crd.yaml b/charts/argo-rollouts/templates/crds/rollout-crd.yaml index 93d06bda..36bf8b00 100644 --- a/charts/argo-rollouts/templates/crds/rollout-crd.yaml +++ b/charts/argo-rollouts/templates/crds/rollout-crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.2.5 name: rollouts.argoproj.io spec: additionalPrinterColumns: @@ -96,6 +98,36 @@ spec: autoPromotionSeconds: format: int32 type: integer + prePromotionAnalysis: + properties: + args: + items: + properties: + name: + type: string + value: + type: string + valueFrom: + properties: + podTemplateHashValue: + type: string + type: object + required: + - name + type: object + type: array + templateName: + type: string + templates: + items: + properties: + templateName: + type: string + required: + - templateName + type: object + type: array + type: object previewReplicaCount: format: int32 type: integer @@ -135,19 +167,28 @@ spec: type: integer templateName: type: string - required: - - templateName + templates: + items: + properties: + templateName: + type: string + required: + - templateName + type: object + type: array type: object canaryService: type: string maxSurge: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true maxUnavailable: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true stableService: type: string steps: @@ -173,8 +214,15 @@ spec: type: array templateName: type: string - required: - - templateName + templates: + items: + properties: + templateName: + type: string + required: + - templateName + type: object + type: array type: object experiment: properties: @@ -263,8 +311,10 @@ spec: pause: properties: duration: - format: int32 - type: integer + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true type: object setWeight: format: int32 @@ -290,6 +340,19 @@ spec: required: - virtualService type: object + nginx: + properties: + additionalIngressAnnotations: + additionalProperties: + type: string + type: object + annotationPrefix: + type: string + stableIngress: + type: string + required: + - stableIngress + type: object type: object type: object type: object @@ -611,7 +674,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -689,8 +756,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -702,8 +770,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -737,8 +806,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -750,8 +820,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -789,8 +860,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -811,8 +883,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -873,8 +946,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -895,8 +969,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -905,6 +980,23 @@ 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: @@ -988,8 +1080,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1010,8 +1103,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1136,7 +1230,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1214,8 +1312,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1227,8 +1326,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1262,8 +1362,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1275,8 +1376,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1314,8 +1416,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1336,8 +1439,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1398,8 +1502,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1420,8 +1525,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1430,6 +1536,23 @@ 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: @@ -1513,8 +1636,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1535,8 +1659,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1665,7 +1790,11 @@ spec: containerName: type: string divisor: - type: string + 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 resource: type: string required: @@ -1743,8 +1872,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1756,8 +1886,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1791,8 +1922,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1804,8 +1936,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1843,8 +1976,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1865,8 +1999,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1927,8 +2062,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -1949,8 +2085,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -1959,6 +2096,23 @@ 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: @@ -2042,8 +2196,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true scheme: type: string required: @@ -2064,8 +2219,9 @@ spec: type: string port: anyOf: - - type: string - type: integer + - type: string + x-kubernetes-int-or-string: true required: - port type: object @@ -2129,7 +2285,11 @@ spec: type: object overhead: additionalProperties: - type: string + 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 preemptionPolicy: type: string @@ -2380,7 +2540,11 @@ spec: medium: type: string sizeLimit: - type: string + 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 fc: properties: @@ -2706,6 +2870,8 @@ spec: properties: activeSelector: type: string + prePromotionAnalysisRun: + type: string previewSelector: type: string previousActiveSelector: @@ -2788,6 +2954,8 @@ spec: type: integer selector: type: string + stableRS: + type: string updatedReplicas: format: int32 type: integer diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml index 1cb707b4..2464b287 100644 --- a/charts/argo-rollouts/values.yaml +++ b/charts/argo-rollouts/values.yaml @@ -12,3 +12,13 @@ controller: serviceAccount: name: argo-rollouts + +## Annotations to be added to the Redis server pods +## +podAnnotations: {} + +## Labels to be added to the Redis server pods +## +podLabels: {} + +imagePullSecrets: []