diff --git a/README.md b/README.md index 871c0cab..63c3aa4b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Argo Helm Charts -Argo Helm is a collection of **community maintained** charts for http://argoproj.io/ projects. the charts can be added using following command: +Argo Helm is a collection of **community maintained** charts for http://argoproj.io/ projects. The charts can be added using following command: ``` helm repo add argo https://argoproj.github.io/argo-helm diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2ed18117..a05fa82b 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.8.4 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.17.0 +version: 2.17.2 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/README.md b/charts/argo-cd/README.md index 382a852a..75a57d67 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -135,6 +135,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | controller.service.labels | Controller service labels. | `{}` | | controller.service.port | Controller service port. | `8082` | | controller.serviceAccount.annotations | Controller service account annotations | `{}` | +| controller.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` | | controller.serviceAccount.create | Create a service account for the controller | `true` | | controller.serviceAccount.name | Service account name. | `"argocd-application-controller"` | | controller.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` | @@ -182,6 +183,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | repoServer.replicas | The number of repo server pods to run | `1` | | repoServer.resources | Resource limits and requests for the repo server pods. | `{}` | | repoServer.service.annotations | Repo server service annotations. | `{}` | +| repoServer.service.automountServiceAccountToken | Automount API credentials for the Service Account | `true` | | repoServer.service.labels | Repo server service labels. | `{}` | | repoServer.service.port | Repo server service port. | `8081` | | repoServer.serviceAccount.annotations | Repo server service account annotations | `{}` | @@ -268,6 +270,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | server.service.externalIPs | Server service external IPs. | `[]` | | server.service.type | Server service type | `"ClusterIP"` | | server.serviceAccount.annotations | Server service account annotations | `{}` | +| server.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` | | server.serviceAccount.create | Create server service account | `true` | | server.serviceAccount.name | Server service account name | `"argocd-server"` | | server.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` | @@ -300,6 +303,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i | dex.podLabels | Labels for the Dex server pods | `{}` | | dex.priorityClassName | Priority class for dex | `""` | | dex.resources | Resource limits and requests for dex | `{}` | +| dex.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` | | dex.serviceAccount.create | Create dex service account | `true` | | dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` | | dex.servicePortGrpc | Server GRPC port | `5557` | diff --git a/charts/argo-cd/crds/crd-project.yaml b/charts/argo-cd/crds/crd-project.yaml index 766b2905..2dab45a5 100644 --- a/charts/argo-cd/crds/crd-project.yaml +++ b/charts/argo-cd/crds/crd-project.yaml @@ -228,23 +228,28 @@ spec: description: Status of the AppProject properties: jwtTokensByRole: - additionalProperties: - description: List of JWTToken objects for a given role - items: - description: Holds the issuedAt and expiresAt values of the token - properties: - exp: - description: The expiresAt value of a token - type: string - iat: - description: The issuedAt value of a token - type: string - id: - description: ID of the token - type: string - type: object - type: array description: JWT Tokens issued for each of the roles in the project + additionalProperties: + properties: + items: + description: List of JWT Tokens issued for the role + items: + description: Holds the issuedAt and expiresAt values of the token + properties: + exp: + description: The expiresAt value of a token + format: int64 + type: integer + iat: + description: The issuedAt value of a token + format: int64 + type: integer + id: + description: ID of the token + type: string + type: object + type: array + type: object type: object type: object required: diff --git a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml index f93114a6..fe923c57 100644 --- a/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/serviceaccount.yaml @@ -1,6 +1,7 @@ {{- if .Values.controller.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }} metadata: name: {{ template "argo-cd.controllerServiceAccountName" . }} {{- if .Values.controller.serviceAccount.annotations }} diff --git a/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml index a0bae942..ea0c983d 100644 --- a/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/serviceaccount.yaml @@ -1,6 +1,7 @@ {{- if .Values.repoServer.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: {{ .Values.repoServer.serviceAccount.automountServiceAccountToken }} metadata: name: {{ template "argo-cd.repoServerServiceAccountName" . }} {{- if .Values.repoServer.serviceAccount.annotations }} diff --git a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml index 2c02f6b7..c286684c 100644 --- a/charts/argo-cd/templates/argocd-server/serviceaccount.yaml +++ b/charts/argo-cd/templates/argocd-server/serviceaccount.yaml @@ -1,6 +1,7 @@ {{- if .Values.server.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: {{ .Values.server.serviceAccount.automountServiceAccountToken }} metadata: name: {{ template "argo-cd.serverServiceAccountName" . }} {{- if .Values.server.serviceAccount.annotations }} diff --git a/charts/argo-cd/templates/dex/serviceaccount.yaml b/charts/argo-cd/templates/dex/serviceaccount.yaml index 1c9413de..2a12c8fb 100644 --- a/charts/argo-cd/templates/dex/serviceaccount.yaml +++ b/charts/argo-cd/templates/dex/serviceaccount.yaml @@ -1,6 +1,7 @@ {{- if .Values.dex.serviceAccount.create }} apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: {{ .Values.dex.serviceAccount.automountServiceAccountToken }} metadata: name: {{ template "argo-cd.dexServiceAccountName" . }} {{- if .Values.dex.serviceAccount.annotations }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index fd28b21b..2a6ce24f 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -131,6 +131,8 @@ controller: name: argocd-application-controller ## Annotations applied to created service account annotations: {} + ## Automount API credentials for the Service Account + automountServiceAccountToken: true ## Server metrics controller configuration metrics: @@ -221,6 +223,8 @@ dex: name: argocd-dex-server ## Annotations applied to created service account annotations: {} + ## Automount API credentials for the Service Account + automountServiceAccountToken: true ## Additional volumeMounts to the controller main container. volumeMounts: @@ -482,6 +486,8 @@ server: name: argocd-server ## Annotations applied to created service account annotations: {} + ## Automount API credentials for the Service Account + automountServiceAccountToken: true ingress: enabled: false @@ -828,6 +834,8 @@ repoServer: # name: argocd-repo-server ## Annotations applied to created service account annotations: {} + ## Automount API credentials for the Service Account + automountServiceAccountToken: true ## Repo server rbac rules # rbac: diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml index 1aaf9e81..b3853226 100644 --- a/charts/argocd-notifications/Chart.yaml +++ b/charts/argocd-notifications/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 1.0.1 +appVersion: 1.0.2 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD. name: argocd-notifications type: application -version: 1.0.14 +version: 1.0.15 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml index 693b377f..ae3fda8f 100644 --- a/charts/argocd-notifications/values.yaml +++ b/charts/argocd-notifications/values.yaml @@ -7,7 +7,7 @@ fullnameOverride: "" image: repository: argoprojlabs/argocd-notifications - tag: v1.0.1 + tag: v1.0.2 pullPolicy: IfNotPresent imagePullSecrets: []