DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into override-namespace-argo-cd

Browse source 
Signed-off-by: Andres Vara <46708607+andres-vara@users.noreply.github.com>
This commit is contained in:
Andres Vara 2024-05-14 09:47:21 +02:00 committed by GitHub
commit ae2399834a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 235 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/lint-and-test.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
options: --user 1001 options: --user 1001
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Run ah lint - name: Run ah lint
working-directory: ./charts working-directory: ./charts
run: ah lint run: ah lint
@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with: with:
fetch-depth: 0 fetch-depth: 0

2
.github/workflows/publish.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with: with:
fetch-depth: 0 fetch-depth: 0

2
.github/workflows/renovate.yaml vendored
View file

@ -23,7 +23,7 @@ jobs:
private-key: ${{ secrets.RENOVATE_APP_PRIVATE_KEY }} private-key: ${{ secrets.RENOVATE_APP_PRIVATE_KEY }}
- name: Checkout - name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Self-hosted Renovate - name: Self-hosted Renovate
uses: renovatebot/github-action@063e0c946b9c1af35ef3450efc44114925d6e8e6 # v40.1.11 uses: renovatebot/github-action@063e0c946b9c1af35ef3450efc44114925d6e8e6 # v40.1.11

4
.github/workflows/scorecard.yml vendored
View file

@ -33,12 +33,12 @@ jobs:
steps: steps:
- name: "Checkout code" - name: "Checkout code"
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with: with:
persist-credentials: false persist-credentials: false
- name: "Run analysis" - name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
with: with:
results_file: results.sarif results_file: results.sarif
results_format: sarif results_format: sarif

12
charts/argo-cd/Chart.yaml
View file

@ -1,9 +1,9 @@
apiVersion: v2 apiVersion: v2
appVersion: v2.10.9 appVersion: v2.11.0
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 6.7.19 version: 6.9.2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:
@ -26,5 +26,9 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added - kind: fixed
description: Support ability to set .Values.namespaceOverride description: Service option externalIPs is available for all service types
- kind: fixed
description: Service option externalTrafficPolicy is available only for Service types LoadBalancer and NodePort
- kind: fixed
description: Load balancer options are available only for Service type LoadBalancer

9
charts/argo-cd/README.md
View file

@ -278,6 +278,9 @@ For full list of changes please check ArtifactHub [changelog].
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version. Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
### 6.9.0
ApplicationSet controller is always created to follow [upstream's manifest](https://github.com/argoproj/argo-cd/blob/v2.11.0/manifests/core-install/kustomization.yaml#L9).
### 6.4.0 ### 6.4.0
Added support for application controller dynamic cluster distribution. Added support for application controller dynamic cluster distribution.
@ -1042,7 +1045,7 @@ NAME: my-release
| server.route.termination_type | string | `"passthrough"` | Termination type of Openshift Route | | server.route.termination_type | string | `"passthrough"` | Termination type of Openshift Route |
| server.service.annotations | object | `{}` | Server service annotations | | server.service.annotations | object | `{}` | Server service annotations |
| server.service.externalIPs | list | `[]` | Server service external IPs | | server.service.externalIPs | list | `[]` | Server service external IPs |
| server.service.externalTrafficPolicy | string | `""` | Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints | | server.service.externalTrafficPolicy | string | `"Cluster"` | Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints |
| server.service.labels | object | `{}` | Server service labels | | server.service.labels | object | `{}` | Server service labels |
| server.service.loadBalancerIP | string | `""` | LoadBalancer will get created with the IP specified in this field | | server.service.loadBalancerIP | string | `""` | LoadBalancer will get created with the IP specified in this field |
| server.service.loadBalancerSourceRanges | list | `[]` | Source IP ranges to allow access to service from | | server.service.loadBalancerSourceRanges | list | `[]` | Source IP ranges to allow access to service from |
@ -1051,8 +1054,9 @@ NAME: my-release
| server.service.servicePortHttp | int | `80` | Server service http port | | server.service.servicePortHttp | int | `80` | Server service http port |
| server.service.servicePortHttpName | string | `"http"` | Server service http port name, can be used to route traffic via istio | | server.service.servicePortHttpName | string | `"http"` | Server service http port name, can be used to route traffic via istio |
| server.service.servicePortHttps | int | `443` | Server service https port | | server.service.servicePortHttps | int | `443` | Server service https port |
| server.service.servicePortHttpsAppProtocol | string | `""` | Server service https port appProtocol |
| server.service.servicePortHttpsName | string | `"https"` | Server service https port name, can be used to route traffic via istio | | server.service.servicePortHttpsName | string | `"https"` | Server service https port name, can be used to route traffic via istio |
| server.service.sessionAffinity | string | `""` | Used to maintain session affinity. Supports `ClientIP` and `None` | | server.service.sessionAffinity | string | `"None"` | Used to maintain session affinity. Supports `ClientIP` and `None` |
| server.service.type | string | `"ClusterIP"` | Server service type | | server.service.type | string | `"ClusterIP"` | Server service type |
| server.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | | server.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
| server.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | | server.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
@ -1342,7 +1346,6 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
| applicationSet.dnsConfig | object | `{}` | [DNS configuration] | | applicationSet.dnsConfig | object | `{}` | [DNS configuration] |
| applicationSet.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for ApplicationSet controller pods | | applicationSet.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for ApplicationSet controller pods |
| applicationSet.emptyDir.sizeLimit | string | `""` (defaults not set if not specified i.e. no size limit) | EmptyDir size limit for applicationSet controller | | applicationSet.emptyDir.sizeLimit | string | `""` (defaults not set if not specified i.e. no size limit) | EmptyDir size limit for applicationSet controller |
| applicationSet.enabled | bool | `true` | Enable ApplicationSet controller |
| applicationSet.extraArgs | list | `[]` | ApplicationSet controller command line flags | | applicationSet.extraArgs | list | `[]` | ApplicationSet controller command line flags |
| applicationSet.extraContainers | list | `[]` | Additional containers to be added to the ApplicationSet controller pod | | applicationSet.extraContainers | list | `[]` | Additional containers to be added to the ApplicationSet controller pod |
| applicationSet.extraEnv | list | `[]` | Environment variables to pass to the ApplicationSet controller | | applicationSet.extraEnv | list | `[]` | Environment variables to pass to the ApplicationSet controller |

3
charts/argo-cd/README.md.gotmpl
View file

@ -278,6 +278,9 @@ For full list of changes please check ArtifactHub [changelog].
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version. Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
### 6.9.0
ApplicationSet controller is always created to follow [upstream's manifest](https://github.com/argoproj/argo-cd/blob/v2.11.0/manifests/core-install/kustomization.yaml#L9).
### 6.4.0 ### 6.4.0
Added support for application controller dynamic cluster distribution. Added support for application controller dynamic cluster distribution.

4
charts/argo-cd/templates/_helpers.tpl
View file

@ -196,6 +196,7 @@ NOTE: Configuration keys must be stored as dict because YAML treats dot as separ
{{- $_ := set $presets "repo.server" (printf "%s:%s" (include "argo-cd.repoServer.fullname" .) (.Values.repoServer.service.port | toString)) -}} {{- $_ := set $presets "repo.server" (printf "%s:%s" (include "argo-cd.repoServer.fullname" .) (.Values.repoServer.service.port | toString)) -}}
{{- $_ := set $presets "server.repo.server.strict.tls" (.Values.repoServer.certificateSecret.enabled | toString ) -}} {{- $_ := set $presets "server.repo.server.strict.tls" (.Values.repoServer.certificateSecret.enabled | toString ) -}}
{{- $_ := set $presets "redis.server" (include "argo-cd.redis.server" .) -}} {{- $_ := set $presets "redis.server" (include "argo-cd.redis.server" .) -}}
{{- $_ := set $presets "applicationsetcontroller.enable.leader.election" (gt ((.Values.applicationSet.replicas | default .Values.applicationSet.replicaCount) | int64) 1) -}}
{{- if .Values.dex.enabled -}} {{- if .Values.dex.enabled -}}
{{- $_ := set $presets "server.dex.server" (include "argo-cd.dex.server" .) -}} {{- $_ := set $presets "server.dex.server" (include "argo-cd.dex.server" .) -}}
{{- $_ := set $presets "server.dex.server.strict.tls" .Values.dex.certificateSecret.enabled -}} {{- $_ := set $presets "server.dex.server.strict.tls" .Values.dex.certificateSecret.enabled -}}
@ -204,9 +205,6 @@ NOTE: Configuration keys must be stored as dict because YAML treats dot as separ
{{- $_ := set $presets (printf "%s.log.format" $component) $.Values.global.logging.format -}} {{- $_ := set $presets (printf "%s.log.format" $component) $.Values.global.logging.format -}}
{{- $_ := set $presets (printf "%s.log.level" $component) $.Values.global.logging.level -}} {{- $_ := set $presets (printf "%s.log.level" $component) $.Values.global.logging.level -}}
{{- end -}} {{- end -}}
{{- if .Values.applicationSet.enabled -}}
{{- $_ := set $presets "applicationsetcontroller.enable.leader.election" (gt ((.Values.applicationSet.replicas | default .Values.applicationSet.replicaCount) | int64) 1) -}}
{{- end -}}
{{- toYaml $presets }} {{- toYaml $presets }}
{{- end -}} {{- end -}}

6
charts/argo-cd/templates/aggregate-roles.yaml
View file

@ -11,9 +11,7 @@ rules:
- argoproj.io - argoproj.io
resources: resources:
- applications - applications
{{- if .Values.applicationSet.enabled }}
- applicationsets - applicationsets
{{- end }}
- appprojects - appprojects
verbs: verbs:
- get - get
@ -33,9 +31,7 @@ rules:
- argoproj.io - argoproj.io
resources: resources:
- applications - applications
{{- if .Values.applicationSet.enabled }}
- applicationsets - applicationsets
{{- end }}
- appprojects - appprojects
verbs: verbs:
- create - create
@ -60,9 +56,7 @@ rules:
- argoproj.io - argoproj.io
resources: resources:
- applications - applications
{{- if .Values.applicationSet.enabled }}
- applicationsets - applicationsets
{{- end }}
- appprojects - appprojects
verbs: verbs:
- create - create

2
charts/argo-cd/templates/argocd-applicationset/deployment.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -332,4 +331,3 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
dnsPolicy: {{ .Values.applicationSet.dnsPolicy }} dnsPolicy: {{ .Values.applicationSet.dnsPolicy }}
{{- end }}

2
charts/argo-cd/templates/argocd-applicationset/ingress.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.ingress.enabled -}} {{- if .Values.applicationSet.ingress.enabled -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:

2
charts/argo-cd/templates/argocd-applicationset/metrics.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.metrics.enabled }} {{- if .Values.applicationSet.metrics.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

2
charts/argo-cd/templates/argocd-applicationset/networkpolicy.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.global.networkPolicy.create (or .Values.applicationSet.metrics.enabled .Values.applicationSet.ingress.enabled) }} {{- if and .Values.global.networkPolicy.create (or .Values.applicationSet.metrics.enabled .Values.applicationSet.ingress.enabled) }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: NetworkPolicy kind: NetworkPolicy
metadata: metadata:

2
charts/argo-cd/templates/argocd-applicationset/pdb.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.pdb.enabled }} {{- if .Values.applicationSet.pdb.enabled }}
apiVersion: policy/v1 apiVersion: policy/v1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:

2
charts/argo-cd/templates/argocd-applicationset/role.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
@ -86,4 +85,3 @@ rules:
- patch - patch
- update - update
- watch - watch
{{- end }}

3
charts/argo-cd/templates/argocd-applicationset/rolebinding.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
@ -14,4 +13,4 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ include "argo-cd.applicationSet.serviceAccountName" . }} name: {{ include "argo-cd.applicationSet.serviceAccountName" . }}
namespace: {{ include "argo-cd.namespace" . }} namespace: {{ include "argo-cd.namespace" . }}
{{- end }}

2
charts/argo-cd/templates/argocd-applicationset/service.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -23,4 +22,3 @@ spec:
targetPort: webhook targetPort: webhook
selector: selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 4 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 4 }}
{{- end }}

2
charts/argo-cd/templates/argocd-applicationset/serviceaccount.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.applicationSet.enabled .Values.applicationSet.serviceAccount.create }} {{- if .Values.applicationSet.serviceAccount.create }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
automountServiceAccountToken: {{ .Values.applicationSet.serviceAccount.automountServiceAccountToken }} automountServiceAccountToken: {{ .Values.applicationSet.serviceAccount.automountServiceAccountToken }}

2
charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml
View file

@ -1,4 +1,3 @@
{{- if .Values.applicationSet.enabled }}
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }} {{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
@ -49,4 +48,3 @@ spec:
matchLabels: matchLabels:
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.applicationSet.name "name" "metrics") | nindent 6 }} {{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.applicationSet.name "name" "metrics") | nindent 6 }}
{{- end }} {{- end }}
{{- end }}

6
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -268,6 +268,12 @@ spec:
key: reposerver.git.request.timeout key: reposerver.git.request.timeout
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
optional: true optional: true
- name: ARGOCD_REVISION_CACHE_LOCK_TIMEOUT
valueFrom:
configMapKeyRef:
key: reposerver.revision.cache.lock.timeout
name: argocd-cmd-params-cm
optional: true
{{- if .Values.repoServer.useEphemeralHelmWorkingDir }} {{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
- name: HELM_CACHE_HOME - name: HELM_CACHE_HOME
value: /helm-working-dir value: /helm-working-dir

2
charts/argo-cd/templates/argocd-repo-server/networkpolicy.yaml
View file

@ -20,11 +20,9 @@ spec:
matchLabels: matchLabels:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 10 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 10 }}
{{- end }} {{- end }}
{{- if .Values.applicationSet.enabled }}
- podSelector: - podSelector:
matchLabels: matchLabels:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 10 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 10 }}
{{- end }}
ports: ports:
- port: repo-server - port: repo-server
protocol: TCP protocol: TCP

2
charts/argo-cd/templates/argocd-server/role.yaml
View file

@ -23,9 +23,7 @@ rules:
- argoproj.io - argoproj.io
resources: resources:
- applications - applications
{{- if .Values.applicationSet.enabled }}
- applicationsets - applicationsets
{{- end }}
- appprojects - appprojects
verbs: verbs:
- create - create

51
charts/argo-cd/templates/argocd-server/service.yaml
View file

@ -1,21 +1,37 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
{{- if .Values.server.service.annotations }}
annotations:
{{- range $key, $value := .Values.server.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
name: {{ template "argo-cd.server.fullname" . }} name: {{ template "argo-cd.server.fullname" . }}
namespace: {{ include "argo-cd.namespace" . | quote }} namespace: {{ include "argo-cd.namespace" . | quote }}
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
{{- if .Values.server.service.labels }} {{- with .Values.server.service.labels }}
{{- toYaml .Values.server.service.labels | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.server.service.annotations }}
annotations:
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
spec: spec:
type: {{ .Values.server.service.type }} type: {{ .Values.server.service.type }}
{{- with .Values.server.service.externalIPs }}
externalIPs: {{ . }}
{{- end }}
{{- if or (eq .Values.server.service.type "LoadBalancer") (eq .Values.server.service.type "NodePort") }}
externalTrafficPolicy: {{ .Values.server.service.externalTrafficPolicy }}
{{- end }}
{{- if eq .Values.server.service.type "LoadBalancer" }}
{{- with .Values.server.service.loadBalancerIP }}
loadBalancerIP: {{ . }}
{{- end }}
{{- with .Values.server.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
sessionAffinity: {{ .Values.server.service.sessionAffinity }}
ports: ports:
- name: {{ .Values.server.service.servicePortHttpName }} - name: {{ .Values.server.service.servicePortHttpName }}
protocol: TCP protocol: TCP
@ -36,21 +52,4 @@ spec:
{{- end }} {{- end }}
selector: selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
{{- if eq .Values.server.service.type "LoadBalancer" }}
{{- if .Values.server.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }}
{{- end }}
{{- if .Values.server.service.externalIPs }}
externalIPs: {{ .Values.server.service.externalIPs }}
{{- end }}
{{- if .Values.server.service.loadBalancerSourceRanges }}
loadBalancerSourceRanges:
{{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }}
{{- end }}
{{- end -}}
{{- with .Values.server.service.externalTrafficPolicy }}
externalTrafficPolicy: {{ . }}
{{- end }}
{{- with .Values.server.service.sessionAffinity }}
sessionAffinity: {{ . }}
{{- end }}

68
charts/argo-cd/templates/crds/crd-application.yaml
View file

@ -353,6 +353,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag> definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to
apply common labels to resource selectors or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -688,6 +692,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -1137,6 +1145,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag> definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -1462,6 +1474,10 @@ spec:
definition in the format [old_image_name=]<image_name>:<image_tag> definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether to apply
common labels to resource selectors or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -1736,6 +1752,19 @@ spec:
description: ID is an auto incrementing identifier of the RevisionHistory description: ID is an auto incrementing identifier of the RevisionHistory
format: int64 format: int64
type: integer type: integer
initiatedBy:
description: InitiatedBy contains information about who initiated
the operations
properties:
automated:
description: Automated is set to true if operation was initiated
automatically by the application controller.
type: boolean
username:
description: Username contains the name of a user who started
operation
type: string
type: object
revision: revision:
description: Revision holds the revision the sync was performed description: Revision holds the revision the sync was performed
against against
@ -1940,6 +1969,10 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -2278,6 +2311,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -2761,6 +2799,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors
or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to description: NamePrefix is a prefix appended to
resources for Kustomize apps resources for Kustomize apps
@ -3117,6 +3160,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies
whether to apply common labels to resource
selectors or not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended description: NamePrefix is a prefix appended
to resources for Kustomize apps to resources for Kustomize apps
@ -3587,6 +3635,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -3936,6 +3989,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to description: NamePrefix is a prefix appended to
resources for Kustomize apps resources for Kustomize apps
@ -4428,6 +4486,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to resources description: NamePrefix is a prefix appended to resources
for Kustomize apps for Kustomize apps
@ -4777,6 +4840,11 @@ spec:
image definition in the format [old_image_name=]<image_name>:<image_tag> image definition in the format [old_image_name=]<image_name>:<image_tag>
type: string type: string
type: array type: array
labelWithoutSelector:
description: LabelWithoutSelector specifies whether
to apply common labels to resource selectors or
not
type: boolean
namePrefix: namePrefix:
description: NamePrefix is a prefix appended to description: NamePrefix is a prefix appended to
resources for Kustomize apps resources for Kustomize apps

98
charts/argo-cd/templates/crds/crd-applicationset.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.crds.install .Values.applicationSet.enabled }} {{- if .Values.crds.install }}
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
@ -267,6 +267,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -481,6 +483,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -854,6 +858,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -1068,6 +1074,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -1445,6 +1453,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -1659,6 +1669,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -2016,6 +2028,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -2230,6 +2244,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -2609,6 +2625,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -2823,6 +2841,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -3196,6 +3216,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -3410,6 +3432,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -3787,6 +3811,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -4001,6 +4027,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -4358,6 +4386,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -4572,6 +4602,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -4937,6 +4969,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -5151,6 +5185,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -5698,6 +5734,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -5912,6 +5950,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -6454,6 +6494,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -6668,6 +6710,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -7039,6 +7083,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -7253,6 +7299,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -7634,6 +7682,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -7848,6 +7898,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -8221,6 +8273,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -8435,6 +8489,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -8812,6 +8868,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -9026,6 +9084,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -9383,6 +9443,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -9597,6 +9659,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -9962,6 +10026,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -10176,6 +10242,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -10723,6 +10791,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -10937,6 +11007,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -11479,6 +11551,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -11693,6 +11767,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -12068,6 +12144,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -12282,6 +12360,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -12646,6 +12726,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -12860,6 +12942,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -13407,6 +13491,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -13621,6 +13707,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -14163,6 +14251,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -14377,6 +14467,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -14823,6 +14915,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:
@ -15037,6 +15131,8 @@ spec:
items: items:
type: string type: string
type: array type: array
labelWithoutSelector:
type: boolean
namePrefix: namePrefix:
type: string type: string
nameSuffix: nameSuffix:

15
charts/argo-cd/values.yaml
View file

@ -1975,18 +1975,22 @@ server:
servicePortHttpName: http servicePortHttpName: http
# -- Server service https port name, can be used to route traffic via istio # -- Server service https port name, can be used to route traffic via istio
servicePortHttpsName: https servicePortHttpsName: https
# -- Server service https port appProtocol. (should be upper case - i.e. HTTPS) # -- Server service https port appProtocol
# servicePortHttpsAppProtocol: HTTPS ## Ref: https://kubernetes.io/docs/concepts/services-networking/service/#application-protocol
servicePortHttpsAppProtocol: ""
# -- LoadBalancer will get created with the IP specified in this field # -- LoadBalancer will get created with the IP specified in this field
loadBalancerIP: "" loadBalancerIP: ""
# -- Source IP ranges to allow access to service from # -- Source IP ranges to allow access to service from
## Ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
loadBalancerSourceRanges: [] loadBalancerSourceRanges: []
# -- Server service external IPs # -- Server service external IPs
externalIPs: [] externalIPs: []
# -- Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints # -- Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints
externalTrafficPolicy: "" ## Ref: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
externalTrafficPolicy: Cluster
# -- Used to maintain session affinity. Supports `ClientIP` and `None` # -- Used to maintain session affinity. Supports `ClientIP` and `None`
sessionAffinity: "" ## Ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
sessionAffinity: None
## Server metrics service configuration ## Server metrics service configuration
metrics: metrics:
@ -2641,9 +2645,6 @@ repoServer:
## ApplicationSet controller ## ApplicationSet controller
applicationSet: applicationSet:
# -- Enable ApplicationSet controller
enabled: true
# -- ApplicationSet controller name string # -- ApplicationSet controller name string
name: applicationset-controller name: applicationset-controller