Skip to content

Commit 09e6ec4

Browse files
committed
align applicationset with upstream
1 parent 30b338a commit 09e6ec4

File tree

4 files changed

+316
-143
lines changed

4 files changed

+316
-143
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v2.6.0-cap-CR-17237
33
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
44
name: argo-cd
5-
version: 5.27.1-1-cap-CR-17237
5+
version: 5.27.1-2-cap-CR-17237
66
kubeVersion: ">=1.22.0-0"
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png

charts/argo-cd/README.md

Lines changed: 46 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,26 +1003,33 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
10031003

10041004
| Key | Type | Default | Description |
10051005
|-----|------|---------|-------------|
1006-
| applicationSet.affinity | object | `{}` | Assign custom [affinity] rules |
1007-
| applicationSet.args.debug | bool | `false` | Print debug logs |
1008-
| applicationSet.args.dryRun | bool | `false` | Enable dry run mode |
1009-
| applicationSet.args.enableLeaderElection | bool | `false` | The default leader election setting |
1010-
| applicationSet.args.metricsAddr | string | `":8080"` | The default metric address |
1011-
| applicationSet.args.policy | string | `"sync"` | How application is synced between the generator and the cluster |
1012-
| applicationSet.args.probeBindAddr | string | `":8081"` | The default health check port |
1006+
| applicationSet.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules |
1007+
| applicationSet.args | object | `{}` | DEPRECATED - ApplicationSet controller command line flags |
1008+
| applicationSet.containerPorts.metrics | int | `8080` | Metrics container port |
1009+
| applicationSet.containerPorts.probe | int | `8081` | Probe container port |
1010+
| applicationSet.containerPorts.webhook | int | `7000` | Webhook container port |
1011+
| applicationSet.containerSecurityContext | object | See [values.yaml] | ApplicationSet controller container-level security context |
1012+
| applicationSet.deploymentAnnotations | object | `{}` | Annotations to be added to ApplicationSet controller Deployment |
1013+
| applicationSet.dnsConfig | object | `{}` | [DNS configuration] |
1014+
| applicationSet.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for ApplicationSet controller pods |
10131015
| applicationSet.enabled | bool | `true` | Enable ApplicationSet controller |
10141016
| applicationSet.extraArgs | list | `[]` | List of extra cli args to add |
1015-
| applicationSet.extraContainers | list | `[]` | Additional containers to be added to the applicationset controller pod |
1016-
| applicationSet.extraEnv | list | `[]` | Environment variables to pass to the controller |
1017-
| applicationSet.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller |
1017+
| applicationSet.extraContainers | list | `[]` | Additional containers to be added to the ApplicationSet controller pod |
1018+
| applicationSet.extraEnv | list | `[]` | Environment variables to pass to the ApplicationSet controller |
1019+
| applicationSet.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the ApplicationSet controller |
10181020
| applicationSet.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) |
10191021
| applicationSet.extraVolumes | list | `[]` | List of extra volumes to add |
1020-
| applicationSet.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the application set controller |
1021-
| applicationSet.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the application set controller |
1022-
| applicationSet.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the application set controller |
1022+
| applicationSet.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the ApplicationSet controller |
1023+
| applicationSet.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the ApplicationSet controller |
1024+
| applicationSet.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the ApplicationSet controller |
10231025
| applicationSet.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | If defined, uses a Secret to pull an image from a private Docker registry or repository. |
1024-
| applicationSet.logFormat | string | `""` (defaults to global.logging.format) | ApplicationSet controller log format. Either `text` or `json` |
1025-
| applicationSet.logLevel | string | `""` (defaults to global.logging.level) | ApplicationSet controller log level. One of: `debug`, `info`, `warn`, `error` |
1026+
| applicationSet.initContainers | list | `[]` | Init containers to add to the ApplicationSet controller pod |
1027+
| applicationSet.livenessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for ApplicationSet controller |
1028+
| applicationSet.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
1029+
| applicationSet.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
1030+
| applicationSet.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
1031+
| applicationSet.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
1032+
| applicationSet.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
10261033
| applicationSet.metrics.enabled | bool | `false` | Deploy metrics service |
10271034
| applicationSet.metrics.service.annotations | object | `{}` | Metrics service annotations |
10281035
| applicationSet.metrics.service.labels | object | `{}` | Metrics service labels |
@@ -1038,34 +1045,40 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
10381045
| applicationSet.metrics.serviceMonitor.scheme | string | `""` | Prometheus ServiceMonitor scheme |
10391046
| applicationSet.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
10401047
| applicationSet.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
1041-
| applicationSet.name | string | `"applicationset-controller"` | Application Set controller name string |
1042-
| applicationSet.nodeSelector | object | `{}` | [Node selector] |
1048+
| applicationSet.name | string | `"applicationset-controller"` | ApplicationSet controller name string |
1049+
| applicationSet.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
10431050
| applicationSet.pdb.annotations | object | `{}` | Annotations to be added to ApplicationSet controller pdb |
10441051
| applicationSet.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the ApplicationSet controller |
10451052
| applicationSet.pdb.labels | object | `{}` | Labels to be added to ApplicationSet controller pdb |
1046-
| applicationSet.pdb.maxUnavailable | string | `""` | Number of pods that are unavailble after eviction as number or percentage (eg.: 50%). |
1053+
| applicationSet.pdb.maxUnavailable | string | `""` | Number of pods that are unavailable after eviction as number or percentage (eg.: 50%). |
10471054
| applicationSet.pdb.minAvailable | string | `""` (defaults to 0 if not specified) | Number of pods that are available after eviction as number or percentage (eg.: 50%) |
1048-
| applicationSet.podAnnotations | object | `{}` | Annotations for the controller pods |
1049-
| applicationSet.podLabels | object | `{}` | Labels for the controller pods |
1050-
| applicationSet.podSecurityContext | object | `{}` | Pod Security Context |
1051-
| applicationSet.priorityClassName | string | `""` | If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default. |
1055+
| applicationSet.podAnnotations | object | `{}` | Annotations for the ApplicationSet controller pods |
1056+
| applicationSet.podLabels | object | `{}` | Labels for the ApplicationSet controller pods |
1057+
| applicationSet.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the ApplicationSet controller pods |
1058+
| applicationSet.readinessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for ApplicationSet controller |
1059+
| applicationSet.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
1060+
| applicationSet.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
1061+
| applicationSet.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
1062+
| applicationSet.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
1063+
| applicationSet.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
10521064
| applicationSet.replicaCount | int | `1` | The number of ApplicationSet controller pods to run |
1053-
| applicationSet.resources | object | `{}` | Resource limits and requests for the controller pods. |
1054-
| applicationSet.securityContext | object | `{}` | Security Context |
1055-
| applicationSet.service.annotations | object | `{}` | Application set service annotations |
1056-
| applicationSet.service.labels | object | `{}` | Application set service labels |
1057-
| applicationSet.service.port | int | `7000` | Application set service port |
1058-
| applicationSet.service.portName | string | `"webhook"` | Application set service port name |
1059-
| applicationSet.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
1060-
| applicationSet.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
1065+
| applicationSet.resources | object | `{}` | Resource limits and requests for the ApplicationSet controller pods. |
1066+
| applicationSet.service.annotations | object | `{}` | ApplicationSet service annotations |
1067+
| applicationSet.service.labels | object | `{}` | ApplicationSet service labels |
1068+
| applicationSet.service.port | int | `7000` | ApplicationSet service port |
1069+
| applicationSet.service.portName | string | `"webhook"` | ApplicationSet service port name |
1070+
| applicationSet.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
1071+
| applicationSet.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
1072+
| applicationSet.serviceAccount.create | bool | `true` | Create ApplicationSet controller service account |
10611073
| applicationSet.serviceAccount.labels | object | `{}` | Labels applied to created service account |
1062-
| applicationSet.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
1063-
| applicationSet.tolerations | list | `[]` | [Tolerations] for use with node taints |
1074+
| applicationSet.serviceAccount.name | string | `"argocd-applicationset-controller"` | ApplicationSet controller service account name |
1075+
| applicationSet.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints |
1076+
| applicationSet.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the ApplicationSet controller |
10641077
| applicationSet.webhook.ingress.annotations | object | `{}` | Additional ingress annotations |
10651078
| applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks |
10661079
| applicationSet.webhook.ingress.extraPaths | list | `[]` | Additional ingress paths |
10671080
| applicationSet.webhook.ingress.hosts | list | `[]` | List of ingress hosts |
1068-
| applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
1081+
| applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress ApplicationSet controller will implement the resource |
10691082
| applicationSet.webhook.ingress.labels | object | `{}` | Additional ingress labels |
10701083
| applicationSet.webhook.ingress.pathType | string | `"Prefix"` | Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific` |
10711084
| applicationSet.webhook.ingress.paths | list | `["/api/webhook"]` | List of ingress paths |

0 commit comments

Comments
 (0)