From 1aea2c41798972ff0077108f926bb9095f3f9deb Mon Sep 17 00:00:00 2001 From: Artyom Bakhtin Date: Thu, 11 Feb 2021 13:40:56 +0300 Subject: [PATCH 1/2] feat: allow custom labels in server ingress (#575) Signed-off-by: Artyom Bakhtin --- charts/argo/Chart.yaml | 2 +- charts/argo/templates/server-ingress.yaml | 3 +++ charts/argo/values.yaml | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml index 4582dd29..a00271cc 100644 --- a/charts/argo/Chart.yaml +++ b/charts/argo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.12.5 description: A Helm chart for Argo Workflows name: argo -version: 0.15.4 +version: 0.16.0 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm maintainers: diff --git a/charts/argo/templates/server-ingress.yaml b/charts/argo/templates/server-ingress.yaml index eb0f37e0..6eab3f50 100644 --- a/charts/argo/templates/server-ingress.yaml +++ b/charts/argo/templates/server-ingress.yaml @@ -14,6 +14,9 @@ metadata: chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- range $key, $value := .Values.server.ingress.labels }} + {{ $key }}: {{ $value | quote }} + {{- end }} annotations: {{- range $key, $value := .Values.server.ingress.annotations }} {{ $key }}: {{ $value | quote }} diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml index 75642af8..43dc94ae 100644 --- a/charts/argo/values.yaml +++ b/charts/argo/values.yaml @@ -226,6 +226,11 @@ server: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + ## Labels to be added to the web ingress. + ## + # labels: + # use-cloudflare-solver: "true" + ## Hostnames. ## Must be provided if Ingress is enabled. ## From f7a6b7b9fc2a3a438ac3c66bfce662cd15bbbb79 Mon Sep 17 00:00:00 2001 From: chgl Date: Sat, 13 Feb 2021 20:45:16 +0100 Subject: [PATCH 2/2] fix: updated CRDs for v1.8.4 (#576) --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 4 +-- charts/argo-cd/crds/crd-application.yaml | 42 ++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 76a42067..cf4fa129 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.14.0 +version: 2.14.1 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 fb6db560..eb079453 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -66,7 +66,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i |-----|------|---------| | global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` | | global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` | -| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.7.6"` | +| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v1.8.4"` | | global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) | | global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` | | global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` | @@ -337,4 +337,4 @@ through `xxx.extraArgs` | redis-ha.haproxy.metrics.enabled | HAProxy enable prometheus metric scraping | `true` | | redis-ha.image.tag | Redis tag | `"5.0.8-alpine"` | -[gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ \ No newline at end of file +[gRPC-ingress]: https://argoproj.github.io/argo-cd/operator-manual/ingress/ diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml index 4884f714..cd4678fa 100644 --- a/charts/argo-cd/crds/crd-application.yaml +++ b/charts/argo-cd/crds/crd-application.yaml @@ -137,6 +137,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -254,6 +256,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -398,6 +405,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -515,6 +524,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -675,6 +689,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -792,6 +808,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -955,6 +976,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -1072,6 +1095,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -1213,6 +1241,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -1330,6 +1360,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string @@ -1468,6 +1503,8 @@ spec: directory: description: Directory holds path/directory specific options properties: + exclude: + type: string jsonnet: description: ApplicationSourceJsonnet holds jsonnet specific options properties: @@ -1585,6 +1622,11 @@ spec: kustomize: description: Kustomize holds kustomize specific options properties: + commonAnnotations: + additionalProperties: + type: string + description: CommonAnnotations adds additional kustomize commonAnnotations + type: object commonLabels: additionalProperties: type: string