From 3cf2841394fc82879bfceb8daf0e7d47feae16eb Mon Sep 17 00:00:00 2001 From: Jesse Suen Date: Tue, 23 Apr 2024 13:07:16 -0700 Subject: [PATCH] feat: argo-cd v2.7.18 Signed-off-by: Jesse Suen --- .github/configs/ct-install.yaml | 3 --- .github/configs/ct-lint.yaml | 3 --- .github/workflows/chart-publish.yml | 3 --- charts/argo-cd/Chart.yaml | 8 ++++---- charts/argo-cd/README.md | 4 ++-- .../argo-cd/templates/argocd-server/deployment.yaml | 6 ++++++ .../notifications-controller/deployment.yaml | 7 +++++++ charts/argo-cd/templates/repo-server/deployment.yaml | 12 ++++++++++++ charts/argo-cd/values.yaml | 2 +- 9 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.github/configs/ct-install.yaml b/.github/configs/ct-install.yaml index 0d92223..aa39714 100644 --- a/.github/configs/ct-install.yaml +++ b/.github/configs/ct-install.yaml @@ -6,9 +6,6 @@ chart-dirs: - charts chart-repos: - akuity=https://charts.akuity.io - - minio=https://helm.min.io/ - - stable=https://charts.helm.sh/stable - - incubator=https://charts.helm.sh/incubator helm-extra-args: "--timeout 1200s" validate-chart-schema: false validate-maintainers: true diff --git a/.github/configs/ct-lint.yaml b/.github/configs/ct-lint.yaml index fdc5781..6c47e2a 100644 --- a/.github/configs/ct-lint.yaml +++ b/.github/configs/ct-lint.yaml @@ -6,9 +6,6 @@ chart-dirs: - charts chart-repos: - akuity=https://charts.akuity.io - - minio=https://helm.min.io/ - - stable=https://charts.helm.sh/stable - - incubator=https://charts.helm.sh/incubator helm-extra-args: "--timeout 600s" validate-chart-schema: false validate-maintainers: true diff --git a/.github/workflows/chart-publish.yml b/.github/workflows/chart-publish.yml index df25351..6711b97 100644 --- a/.github/workflows/chart-publish.yml +++ b/.github/workflows/chart-publish.yml @@ -19,9 +19,6 @@ jobs: - name: Add dependency chart repos run: | helm repo add akuity https://charts.akuity.io - helm repo add minio https://helm.min.io/ - helm repo add stable https://charts.helm.sh/stable - helm repo add incubator https://charts.helm.sh/incubator - name: Configure Git run: | git config user.name "$GITHUB_ACTOR" diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 114a05d..b0fab0e 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -version: 2.7.11-ak.0.0 -appVersion: 2.7.11 +version: 2.7.18-ak.0.0 +appVersion: 2.7.18 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd home: https://charts.akuity.io @@ -10,14 +10,14 @@ keywords: - argocd - gitops maintainers: - - name: terrytangyuan - email: terry@akuity.io - name: jessesuen email: jesse@akuity.io - name: wanghong230 email: hong@akuity.io - name: evgeny-goldin email: evgeny@akuity.io + - name: 34fathombelow + email: justin@akuity.io dependencies: - name: argo-cd-extensions diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 2dc368f..a01f6f8 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -1,6 +1,6 @@ # argo-cd -![Version: 2.7.11-ak.0.0](https://img.shields.io/badge/Version-2.7.11--ak.0.0-informational?style=flat-square) ![AppVersion: 2.7.11](https://img.shields.io/badge/AppVersion-2.7.11-informational?style=flat-square) +![Version: 2.7.18-ak.0.0](https://img.shields.io/badge/Version-2.7.18--ak.0.0-informational?style=flat-square) ![AppVersion: 2.7.18](https://img.shields.io/badge/AppVersion-2.7.18-informational?style=flat-square) A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. @@ -10,10 +10,10 @@ A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kube | Name | Email | Url | | ---- | ------ | --- | -| terrytangyuan | | | | jessesuen | | | | wanghong230 | | | | evgeny-goldin | | | +| 34fathombelow | | | ## Requirements diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 0f53f5f..ebb2f92 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -248,6 +248,12 @@ spec: key: server.enable.proxy.extension name: argocd-cmd-params-cm optional: true + - name: ARGOCD_API_CONTENT_TYPES + valueFrom: + configMapKeyRef: + key: server.api.content.types + name: argocd-cmd-params-cm + optional: true image: {{ include "argo-cd.image" (dict "root" . "image" .Values.server.image ) }} imagePullPolicy: {{ default .Values.global.image.pullPolicy .Values.server.image.pullPolicy }} livenessProbe: diff --git a/charts/argo-cd/templates/notifications-controller/deployment.yaml b/charts/argo-cd/templates/notifications-controller/deployment.yaml index 077c773..6f03c2d 100644 --- a/charts/argo-cd/templates/notifications-controller/deployment.yaml +++ b/charts/argo-cd/templates/notifications-controller/deployment.yaml @@ -22,6 +22,13 @@ spec: containers: - args: - /usr/local/bin/argocd-notifications + env: + - name: ARGOCD_APPLICATION_NAMESPACES + valueFrom: + configMapKeyRef: + key: application.namespaces + name: argocd-cmd-params-cm + optional: true image: {{ include "argo-cd.image" (dict "root" . "image" .Values.controller.image ) }} imagePullPolicy: {{ default .Values.global.image.pullPolicy .Values.controller.image.pullPolicy }} livenessProbe: diff --git a/charts/argo-cd/templates/repo-server/deployment.yaml b/charts/argo-cd/templates/repo-server/deployment.yaml index b323ff9..979fe0d 100755 --- a/charts/argo-cd/templates/repo-server/deployment.yaml +++ b/charts/argo-cd/templates/repo-server/deployment.yaml @@ -165,6 +165,18 @@ spec: key: reposerver.streamed.manifest.max.extracted.size name: argocd-cmd-params-cm optional: true + - name: ARGOCD_REPO_SERVER_HELM_MANIFEST_MAX_EXTRACTED_SIZE + valueFrom: + configMapKeyRef: + key: reposerver.helm.manifest.max.extracted.size + name: argocd-cmd-params-cm + optional: true + - name: ARGOCD_REPO_SERVER_DISABLE_HELM_MANIFEST_MAX_EXTRACTED_SIZE + valueFrom: + configMapKeyRef: + key: reposerver.disable.helm.manifest.max.extracted.size + name: argocd-cmd-params-cm + optional: true - name: ARGOCD_GIT_MODULES_ENABLED valueFrom: configMapKeyRef: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index a877db6..6e1b1f4 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -349,7 +349,7 @@ redis: image: repository: quay.io/akuity/redis # https://hub.docker.com/_/redis/ - tag: 7.0.11-alpine + tag: 7.0.14-alpine pullPolicy: # IfNotPresent haProxyImage: # https://hub.docker.com/_/haproxy