From eb88e900b24a1a44e2a25634a0b34a9ffde52b37 Mon Sep 17 00:00:00 2001 From: Mike Bryant Date: Sun, 25 Oct 2020 04:55:44 +0000 Subject: [PATCH] chore: Sync upstream CRDs (#478) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/crds/crd-application.yaml | 39 ++++++++++++++++++++++-- charts/argo-cd/crds/crd-project.yaml | 25 --------------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 7ecd4ab6..a248fff8 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.7.6 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.9.3 +version: 2.9.4 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml index b18d2058..5a08d884 100644 --- a/charts/argo-cd/crds/crd-application.yaml +++ b/charts/argo-cd/crds/crd-application.yaml @@ -8,6 +8,17 @@ metadata: annotations: helm.sh/hook: crd-install spec: + additionalPrinterColumns: + - JSONPath: .status.sync.status + name: Sync Status + type: string + - JSONPath: .status.health.status + name: Health Status + type: string + - JSONPath: .status.sync.revision + name: Revision + priority: 10 + type: string group: argoproj.io names: kind: Application @@ -18,6 +29,7 @@ spec: - apps singular: application scope: Namespaced + subresources: {} validation: openAPIV3Schema: description: Application is a definition of Application resource. @@ -208,6 +220,9 @@ spec: values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options @@ -296,7 +311,7 @@ spec: description: SyncStrategy describes how to perform the sync properties: apply: - description: Apply wil perform a `kubectl apply` to perform the sync. + description: Apply will perform a `kubectl apply` to perform the sync. properties: force: description: Force indicates whether or not to supply the --force flag to `kubectl apply`. The --force flag deletes and re-create the resource, when PATCH encounters conflict and has retried for 5 times. @@ -466,6 +481,9 @@ spec: values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options @@ -551,6 +569,9 @@ spec: automated: description: Automated will keep an application synced to the target revision properties: + allowEmpty: + description: 'AllowEmpty allows apps have zero live resources (default: false)' + type: boolean prune: description: 'Prune will prune resources automatically as part of automated sync (default: false)' type: boolean @@ -737,6 +758,9 @@ spec: values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options @@ -823,7 +847,7 @@ spec: type: object type: array observedAt: - description: ObservedAt indicates when the application state was updated without querying latest git state + description: 'ObservedAt indicates when the application state was updated without querying latest git state Deprecated: controller no longer updates ObservedAt field' format: date-time type: string operationState: @@ -1014,6 +1038,9 @@ spec: values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options @@ -1102,7 +1129,7 @@ spec: description: SyncStrategy describes how to perform the sync properties: apply: - description: Apply wil perform a `kubectl apply` to perform the sync. + description: Apply will perform a `kubectl apply` to perform the sync. properties: force: description: Force indicates whether or not to supply the --force flag to `kubectl apply`. The --force flag deletes and re-create the resource, when PATCH encounters conflict and has retried for 5 times. @@ -1269,6 +1296,9 @@ spec: values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options @@ -1521,6 +1551,9 @@ spec: values: description: Values is Helm values, typically defined as a block type: string + version: + description: Version is the Helm version to use for templating with + type: string type: object ksonnet: description: Ksonnet holds ksonnet specific options diff --git a/charts/argo-cd/crds/crd-project.yaml b/charts/argo-cd/crds/crd-project.yaml index 5ac16fa2..35d9dde9 100644 --- a/charts/argo-cd/crds/crd-project.yaml +++ b/charts/argo-cd/crds/crd-project.yaml @@ -220,31 +220,6 @@ spec: type: object type: array type: object - status: - description: AppProjectStatus contains information about appproj - properties: - jwtTokensByRole: - additionalProperties: - properties: - items: - items: - description: JWTToken holds the issuedAt and expiresAt values of a token - properties: - exp: - format: int64 - type: integer - iat: - format: int64 - type: integer - id: - type: string - required: - - iat - type: object - type: array - type: object - type: object - type: object required: - metadata - spec