Compare commits

...

29 Commits

Author SHA1 Message Date
Nitin Verma 9bfd248c34
feat(argo-rollouts): support dnsConfig parameter (#3405)
Signed-off-by: Nitin Verma <nitin.verma@cint.com>
Co-authored-by: Aikawa <yu.croco@gmail.com>
2025-08-04 09:28:06 +01:00
dependabot[bot] f68d732db5
chore(deps): bump github/codeql-action from 3.29.4 to 3.29.5 in the dependencies group (#3409) 2025-08-02 11:45:24 -05:00
argoproj-renovate[bot] cf65edcffc
chore(deps): update ghcr.io/renovatebot/renovate docker tag to v41.46.8 (#3408) 2025-08-01 19:08:21 +09:00
KIMJiho afb9284246
docs(argo-cd): update NOTES.txt for conditional rootpath (#3407) 2025-07-31 16:28:54 +02:00
Dmytro Bondar a3779e5aed
fix(argo-cd): Fix inheritance of 'global.logging' values for the commit server component (#3404)
Added commitserver to default logging configuration preset

Signed-off-by: Dmytro Bondar <git@bonddim.dev>
Co-authored-by: Aikawa <yu.croco@gmail.com>
2025-07-30 09:05:35 +02:00
argoproj-renovate[bot] da6c7c634a
chore(deps): update renovatebot/github-action action to v43.0.5 (#3402)
Signed-off-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
2025-07-28 09:54:08 -05:00
인준 f8cf03f4b4
fix(argo-cd): correct typo 'Addtional' to 'Additional' in values.yaml (#3403)
* fix(argo-cd): correct typo 'Addtional' to 'Additional' in values.yaml

Signed-off-by: in-jun <me@injun.dev>

* docs(argo-cd): update README.md to fix typo 'Addtional' to 'Additional'

Generated by running ./scripts/helm-docs.sh as requested in PR review.

Signed-off-by: in-jun <me@injun.dev>

---------

Signed-off-by: in-jun <me@injun.dev>
2025-07-28 11:45:03 +01:00
dependabot[bot] dd6d10395c
chore(deps): bump github/codeql-action from 3.29.2 to 3.29.4 in the dependencies group (#3400)
chore(deps): bump github/codeql-action in the dependencies group

Bumps the dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.29.2 to 3.29.4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](181d5eefc2...4e828ff8d4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-07-26 10:08:06 -05:00
argoproj-renovate[bot] 5b2f72cb14
chore(argo-cd): Update dependency argoproj/argo-cd to v3.0.12 (#3399) 2025-07-26 07:54:19 +09:00
Andreas Lindhé 45f5a3bf77
chore(argo-cd): Set file mode of YAML files to 644 (#3397)
* chore(argo-cd): Set file mode of YAML files to 644

Some deployment.yaml files randomly had the executable bit set.
This change fixes that.

Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>

* chore(argo-cd): Bump chart version

Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>

* chore(argo-cd): Update changes in Chart.yaml

Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>

* chore(argo-cd): Remove previous change log entry

Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>

---------

Signed-off-by: Andreas Lindhé <7773090+lindhe@users.noreply.github.com>
Co-authored-by: Aikawa <yu.croco@gmail.com>
2025-07-25 08:37:02 +00:00
Aikawa 303fcf8a55
fix(argo-rollouts): Fix to render ingress's port properly (#3395)
* fix(argo-rollouts): Fix to render ingress's port properly

Signed-off-by: yu-croco <yu.croco@gmail.com>

* fix lint

Signed-off-by: yu-croco <yu.croco@gmail.com>

* add test for ingress

Signed-off-by: yu-croco <yu.croco@gmail.com>

---------

Signed-off-by: yu-croco <yu.croco@gmail.com>
2025-07-24 07:18:50 -05:00
argoproj-renovate[bot] c87d581b79
chore(argo-workflows): Update dependency argoproj/argo-workflows to v3.7.0 (#3396)
* chore(argo-workflows): Update dependency argoproj/argo-workflows to v3.7.0

Signed-off-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>

* merge in changes

Signed-off-by: Tim Collins <tim@thecollins.team>

---------

Signed-off-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Tim Collins <tim@thecollins.team>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Co-authored-by: Tim Collins <tim@thecollins.team>
2025-07-23 20:49:40 +09:00
Aswin Thiyagarajan 835e7d2c94
feat(argo-cd): Support ability to override `.global.networkPolicy.create` at the component level (#3382)
* feat(argo-cd): Support to ability to override default network policy create at a component level

Signed-off-by: Aswin Thiyagarajan <niwsa22@gmail.com>

* feat(argo-cd): update README.md

Signed-off-by: Aswin Thiyagarajan <niwsa22@gmail.com>

* feat(argo-cd): update conditions for networkpolicy creation

Signed-off-by: Aswin Thiyagarajan <niwsa22@gmail.com>

* feat(argo-cd) address review comments

Signed-off-by: Aswin Thiyagarajan <niwsa22@gmail.com>

---------

Signed-off-by: Aswin Thiyagarajan <niwsa22@gmail.com>
2025-07-22 18:30:34 +01:00
민선 (minnie) bbac4b365b
docs(argo-cd): document admin password via helm.values in Application CR (#3390)
* docs(argo-cd): document admin password via helm.values in Application CR

Signed-off-by: miinsun <kor3334@naver.com>
Signed-off-by: 민선 (minnie) <61786235+miinsun@users.noreply.github.com>

* chore(chart): bump version to 8.1.4 and update changelog

Signed-off-by: 민선 (minnie) <61786235+miinsun@users.noreply.github.com>

---------

Signed-off-by: miinsun <kor3334@naver.com>
Signed-off-by: 민선 (minnie) <61786235+miinsun@users.noreply.github.com>
2025-07-21 23:11:36 +09:00
argoproj-renovate[bot] 3c7747d229
chore(deps): update renovatebot/github-action action to v43.0.4 (#3393) 2025-07-21 03:52:38 -05:00
Tim Collins 814c818c7d
fix(argo-workflows): Improve ingress service logic to fix Helm 3.18 incompatibility (#3386)
* fix(argo-workflows): Replace "float64" with "int" to fix Helm 3.18 incompatibility

Signed-off-by: Tim Collins <tim@thecollins.team>

* maybe checking for string is safer?

Signed-off-by: Tim Collins <tim@thecollins.team>

* ok. now try this way again

Signed-off-by: Tim Collins <tim@thecollins.team>

* well that still doesn't work. revert

Signed-off-by: Tim Collins <tim@thecollins.team>

---------

Signed-off-by: Tim Collins <tim@thecollins.team>
Co-authored-by: Aikawa <yu.croco@gmail.com>
2025-07-16 23:10:24 +09:00
Tim Collins 5636e15e1c
fix(argo-rollouts): Replace "float64" with "int" to fix Helm 3.18 incompatibility (#3387) 2025-07-15 09:03:39 -05:00
argoproj-renovate[bot] 9fc0abbbfc
chore(deps): update renovatebot/github-action action to v43.0.3 (#3383) 2025-07-14 07:01:09 +00:00
argoproj-renovate[bot] 0f9d1fe201
chore(argo-events): Update dependency argoproj/argo-events to v1.9.7 (#3384)
Signed-off-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
2025-07-14 15:21:15 +09:00
argoproj-renovate[bot] dd206e8e30
chore(argo-cd): Update dependency argoproj/argo-cd to v3.0.11 (#3380) 2025-07-10 17:31:58 +01:00
tcaenen 85e7577e4f
feat(argo-rollouts): Support ability to set .Values.namespaceOverride (#3375) 2025-07-09 11:03:39 +09:00
dependabot[bot] bd8552e708
chore(deps): bump github/codeql-action from 3.29.1 to 3.29.2 in the dependencies group (#3378)
chore(deps): bump github/codeql-action in the dependencies group

Bumps the dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.29.1 to 3.29.2
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](39edc492db...181d5eefc2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-07-07 18:16:09 +09:00
argoproj-renovate[bot] 577827ac27
chore(deps): update ghcr.io/renovatebot/renovate docker tag to v41 (#3373)
Signed-off-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
2025-07-04 23:23:10 +09:00
argoproj-renovate[bot] a9bf56c4e5
chore(deps): update renovatebot/github-action action to v43.0.2 (#3371) 2025-06-30 01:10:26 -05:00
dependabot[bot] 3f0af234e9
chore(deps): bump github/codeql-action from 3.29.0 to 3.29.1 in the dependencies group (#3370)
chore(deps): bump github/codeql-action in the dependencies group

Bumps the dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.29.0 to 3.29.1
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](ce28f5bb42...39edc492db)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-06-28 13:36:00 +02:00
Alexej Disterhoft 57aa1b7dbf
fix(argo-cd): do not use hardcoded commit server URL (#3367)
* fix(argo-cd): do not use hardcoded commit server URL

This commit adds the required template logic to the Argo CD Helm chart
to use the proper, release name dependent URL for the commit server. The current
implementation uses the default hardcoded URL `argocd-commit-server:8086`
from <https://github.com/argoproj/argo-cd/blob/v3.0.9/common/common.go#L31>.

Signed-off-by: Alexej Disterhoft <alexej.disterhoft@redcare-pharmacy.com>

* chore(argo-cd): update version to 8.1.2

Signed-off-by: Alexej Disterhoft <alexej.disterhoft@redcare-pharmacy.com>

* docs(argo-cd): add commit server service port and port name to README

Signed-off-by: Alexej Disterhoft <alexej.disterhoft@redcare-pharmacy.com>

---------

Signed-off-by: Alexej Disterhoft <alexej.disterhoft@redcare-pharmacy.com>
2025-06-27 20:14:50 +09:00
argoproj-renovate[bot] 91afef15ec
chore(deps): update renovatebot/github-action action to v43.0.1 (#3366) 2025-06-23 08:01:49 +02:00
argoproj-renovate[bot] 102bed8590
chore(deps): update renovatebot/github-action action to v43 (#3363) 2025-06-20 08:25:17 -05:00
AvivGuiser 93c742ffe7
feat(argo-workflows): add option to specify the schema in service monitor (#3355)
* feat(argo-workflows): add option to specify the schema in service monitor

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

* fix typos

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

---------

Signed-off-by: AvivGuiser <avivguiser@gmail.com>
Co-authored-by: Aikawa <yu.croco@gmail.com>
2025-06-20 08:13:31 +02:00
53 changed files with 258 additions and 62 deletions

View File

@ -26,11 +26,11 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Self-hosted Renovate
uses: renovatebot/github-action@87c405b9750f1b6affae06311395b50e3882d54f # v42.0.6
uses: renovatebot/github-action@a889a8abcb11ef7feaafaf5e483ea01d4bf7774e # v43.0.5
with:
configurationFile: .github/configs/renovate-config.js
# renovate: datasource=docker depName=ghcr.io/renovatebot/renovate
renovate-version: 40.37.1
renovate-version: 41.46.8
token: '${{ steps.get_token.outputs.token }}'
mount-docker-socket: true
env:

View File

@ -68,6 +68,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
with:
sarif_file: results.sarif

View File

@ -1,9 +1,9 @@
apiVersion: v2
appVersion: v3.0.6
appVersion: v3.0.12
kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 8.1.1
version: 8.2.5
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
@ -27,4 +27,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: added
description: Add support for custom deployment labels
description: Add condition for rootpath in NOTES.txt

View File

@ -237,6 +237,31 @@ server:
enabled: true
```
## Setting the initial admin password via Argo CD Application CR
> **Note:** When deploying the `argo-cd` chart via an Argo CD `Application` CR, define your bcrypt-hashed admin password under `helm.values`—not `helm.parameters`—because Argo CD performs variable substitution on `parameters`, which will mangle any `$…` in your hash.
```yaml
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: argocd-testing
spec:
destination:
namespace: testing
server: https://kubernetes.default.svc
project: default
source:
chart: argo-cd
repoURL: https://argoproj.github.io/argo-helm
targetRevision: 3.21.0
helm:
values: |
configs:
secret:
argocdServerAdminPassword: $2a$10$H1a30nMr9v2QE2nkyz0BoOD2J0I6FQFMtHS0csEg12RBWzfRuuoE6
```
## Synchronizing Changes from Original Repository
In the original [Argo CD repository](https://github.com/argoproj/argo-cd/) an [`manifests/install.yaml`](https://github.com/argoproj/argo-cd/blob/master/manifests/install.yaml) is generated using `kustomize`. It's the basis for the installation as [described in the docs](https://argo-cd.readthedocs.io/en/stable/getting_started/#1-install-argo-cd).
@ -706,7 +731,7 @@ NAME: my-release
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| apiVersionOverrides | object | `{}` | |
| crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
| crds.additionalLabels | object | `{}` | Additional labels to be added to all CRDs |
| crds.annotations | object | `{}` | Annotations to be added to all CRDs |
| crds.install | bool | `true` | Install and upgrade CRDs |
| crds.keep | bool | `true` | Keep CRDs on chart uninstall |
@ -897,6 +922,7 @@ NOTE: Any values you put under `.Values.configs.cm` are passed to argocd-cm Conf
| controller.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| controller.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| controller.name | string | `"application-controller"` | Application controller name string |
| controller.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by application controller |
| controller.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| controller.pdb.annotations | object | `{}` | Annotations to be added to application controller pdb |
| controller.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the application controller |
@ -994,6 +1020,7 @@ NOTE: Any values you put under `.Values.configs.cm` are passed to argocd-cm Conf
| repoServer.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| repoServer.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| repoServer.name | string | `"repo-server"` | Repo server name |
| repoServer.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by repo server |
| repoServer.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| repoServer.pdb.annotations | object | `{}` | Annotations to be added to repo server pdb |
| repoServer.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the repo server |
@ -1147,6 +1174,7 @@ NOTE: Any values you put under `.Values.configs.cm` are passed to argocd-cm Conf
| server.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| server.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| server.name | string | `"server"` | Argo CD server name |
| server.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by ArgoCD Server |
| server.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| server.pdb.annotations | object | `{}` | Annotations to be added to Argo CD server pdb |
| server.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the Argo CD server |
@ -1257,6 +1285,7 @@ NOTE: Any values you put under `.Values.configs.cm` are passed to argocd-cm Conf
| dex.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| dex.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| dex.name | string | `"dex-server"` | Dex name |
| dex.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by Dex server |
| dex.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| dex.pdb.annotations | object | `{}` | Annotations to be added to Dex server pdb |
| dex.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the Dex server |
@ -1361,6 +1390,7 @@ NOTE: Any values you put under `.Values.configs.cm` are passed to argocd-cm Conf
| redis.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| redis.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| redis.name | string | `"redis"` | Redis name |
| redis.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by redis |
| redis.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| redis.pdb.annotations | object | `{}` | Annotations to be added to Redis pdb |
| redis.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the Redis |
@ -1557,6 +1587,7 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
| applicationSet.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| applicationSet.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| applicationSet.name | string | `"applicationset-controller"` | ApplicationSet controller name string |
| applicationSet.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by ApplicationSet controller |
| applicationSet.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| applicationSet.pdb.annotations | object | `{}` | Annotations to be added to ApplicationSet controller pdb |
| applicationSet.pdb.enabled | bool | `false` | Deploy a [PodDisruptionBudget] for the ApplicationSet controller |
@ -1641,6 +1672,7 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
| notifications.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector |
| notifications.metrics.serviceMonitor.tlsConfig | object | `{}` | Prometheus ServiceMonitor tlsConfig |
| notifications.name | string | `"notifications-controller"` | Notifications controller name string |
| notifications.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by notifications controller |
| notifications.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| notifications.notifiers | object | See [values.yaml] | Configures notification services such as slack, email or custom webhook |
| notifications.pdb.annotations | object | `{}` | Annotations to be added to notifications controller pdb |
@ -1714,6 +1746,7 @@ To read more about this component, please read [Argo CD Manifest Hydrator] and [
| commitServer.metrics.service.servicePort | int | `8087` | Metrics service port |
| commitServer.metrics.service.type | string | `"ClusterIP"` | Metrics service type |
| commitServer.name | string | `"commit-server"` | Commit server name |
| commitServer.networkPolicy.create | bool | `false` (defaults to global.networkPolicy.create) | Default network policy rules used by commit server |
| commitServer.nodeSelector | object | `{}` (defaults to global.nodeSelector) | [Node selector] |
| commitServer.podAnnotations | object | `{}` | Annotations for the commit server pods |
| commitServer.podLabels | object | `{}` | Labels for the commit server pods |
@ -1727,6 +1760,8 @@ To read more about this component, please read [Argo CD Manifest Hydrator] and [
| commitServer.runtimeClassName | string | `""` (defaults to global.runtimeClassName) | Runtime class name for the commit server |
| commitServer.service.annotations | object | `{}` | commit server service annotations |
| commitServer.service.labels | object | `{}` | commit server service labels |
| commitServer.service.port | int | `8086` | commit server service port |
| commitServer.service.portName | string | `"server"` | commit server service port name |
| commitServer.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
| commitServer.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
| commitServer.serviceAccount.create | bool | `true` | Create commit server service account |

View File

@ -236,6 +236,31 @@ server:
enabled: true
```
## Setting the initial admin password via Argo CD Application CR
> **Note:** When deploying the `argo-cd` chart via an Argo CD `Application` CR, define your bcrypt-hashed admin password under `helm.values`—not `helm.parameters`—because Argo CD performs variable substitution on `parameters`, which will mangle any `$…` in your hash.
```yaml
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: argocd-testing
spec:
destination:
namespace: testing
server: https://kubernetes.default.svc
project: default
source:
chart: argo-cd
repoURL: https://argoproj.github.io/argo-helm
targetRevision: 3.21.0
helm:
values: |
configs:
secret:
argocdServerAdminPassword: $2a$10$H1a30nMr9v2QE2nkyz0BoOD2J0I6FQFMtHS0csEg12RBWzfRuuoE6
```
## Synchronizing Changes from Original Repository

View File

@ -12,10 +12,13 @@ DEPRECATED option dex.logFormat - Use `configs.params."dexserver.log.format"`
{{- end }}
In order to access the server UI you have the following options:
{{ $rootpath := default "" (index .Values "configs" "params" "server.rootpath") -}}
1. kubectl port-forward service/{{ include "argo-cd.fullname" . }}-server -n {{ include "argo-cd.namespace" . }} 8080:443
{{ if $rootpath }}
and then open the browser on http://localhost:8080/{{ $rootpath }} and accept the certificate
{{ else }}
and then open the browser on http://localhost:8080 and accept the certificate
{{ end }}
2. enable ingress in the values file `server.ingress.enabled` and either
- Add the annotation for ssl passthrough: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/#option-1-ssl-passthrough
- Set the `configs.params."server.insecure"` in the values file and terminate SSL at your ingress: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/#option-2-multiple-ingress-objects-and-hosts

View File

@ -238,7 +238,10 @@ NOTE: Configuration keys must be stored as dict because YAML treats dot as separ
{{- $_ := set $presets "server.dex.server" (include "argo-cd.dex.server" .) -}}
{{- $_ := set $presets "server.dex.server.strict.tls" .Values.dex.certificateSecret.enabled -}}
{{- end -}}
{{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" "notificationscontroller" "dexserver" -}}
{{- if .Values.commitServer.enabled -}}
{{- $_ := set $presets "commit.server" (printf "%s:%s" (include "argo-cd.commitServer.fullname" .) (.Values.commitServer.service.port | toString)) -}}
{{- end -}}
{{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" "notificationscontroller" "dexserver" "commitserver" -}}
{{- $_ := set $presets (printf "%s.log.format" $component) $.Values.global.logging.format -}}
{{- $_ := set $presets (printf "%s.log.level" $component) $.Values.global.logging.level -}}
{{- end -}}

View File

@ -342,6 +342,12 @@ spec:
name: argocd-cmd-params-cm
key: controller.cluster.cache.events.processing.interval
optional: true
- name: ARGOCD_APPLICATION_CONTROLLER_COMMIT_SERVER
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: commit.server
optional: true
{{- with .Values.controller.envFrom }}
envFrom:
{{- toYaml . | nindent 10 }}

View File

@ -1,4 +1,4 @@
{{- if .Values.global.networkPolicy.create }}
{{- if or .Values.controller.networkPolicy.create .Values.global.networkPolicy.create }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:

View File

@ -344,6 +344,12 @@ spec:
name: argocd-cmd-params-cm
key: controller.cluster.cache.events.processing.interval
optional: true
- name: ARGOCD_APPLICATION_CONTROLLER_COMMIT_SERVER
valueFrom:
configMapKeyRef:
name: argocd-cmd-params-cm
key: commit.server
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
{{- with .Values.controller.envFrom }}

View File

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

View File

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

View File

@ -17,10 +17,10 @@ metadata:
{{- end }}
spec:
ports:
- name: server
- name: {{ .Values.commitServer.service.portName }}
protocol: TCP
port: 8086
targetPort: 8086
port: {{ .Values.commitServer.service.port }}
targetPort: server
selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.commitServer.name) | nindent 4 }}
{{- end }}

View File

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

View File

View File

@ -1,4 +1,4 @@
{{- if .Values.global.networkPolicy.create }}
{{- if or .Values.repoServer.networkPolicy.create .Values.global.networkPolicy.create }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:

0
charts/argo-cd/templates/argocd-server/deployment.yaml Executable file → Normal file
View File

View File

@ -1,4 +1,4 @@
{{- if .Values.global.networkPolicy.create }}
{{- if or .Values.server.networkPolicy.create .Values.global.networkPolicy.create }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:

0
charts/argo-cd/templates/dex/deployment.yaml Executable file → Normal file
View File

View File

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

0
charts/argo-cd/templates/redis/deployment.yaml Executable file → Normal file
View File

View File

@ -1,5 +1,5 @@
{{- $redisHa := (index .Values "redis-ha") -}}
{{- if and .Values.global.networkPolicy.create .Values.redis.enabled (not $redisHa.enabled) }}
{{- if and (or .Values.redis.networkPolicy.create .Values.global.networkPolicy.create) .Values.redis.enabled (not $redisHa.enabled) }}
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:

View File

@ -35,7 +35,7 @@ crds:
keep: true
# -- Annotations to be added to all CRDs
annotations: {}
# -- Addtional labels to be added to all CRDs
# -- Additional labels to be added to all CRDs
additionalLabels: {}
## Globally shared configuration
@ -1090,6 +1090,12 @@ controller:
# -- List of custom rules for the application controller's ClusterRole resource
rules: []
# Default application controller's network policy
networkPolicy:
# -- Default network policy rules used by application controller
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
## Dex
dex:
# -- Enable dex
@ -1389,6 +1395,12 @@ dex:
# maxSurge: 25%
# maxUnavailable: 25%
# Default Dex server's network policy
networkPolicy:
# -- Default network policy rules used by Dex server
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
# DEPRECATED - Use configs.params to override
# -- Dex log format. Either `text` or `json`
# @default -- `""` (defaults to global.logging.format)
@ -1709,6 +1721,12 @@ redis:
# -- Prometheus ServiceMonitor annotations
annotations: {}
# Default redis's network policy
networkPolicy:
# -- Default network policy rules used by redis
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
## Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true`
# Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml
redis-ha:
@ -2575,6 +2593,12 @@ server:
# -- List of custom rules for the server's ClusterRole resource
rules: []
# Default ArgoCD Server's network policy
networkPolicy:
# -- Default network policy rules used by ArgoCD Server
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
## Repo Server
repoServer:
# -- Repo server name
@ -2974,6 +2998,12 @@ repoServer:
# - list
# - watch
# Default repo server's network policy
networkPolicy:
# -- Default network policy rules used by repo server
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
## ApplicationSet controller
applicationSet:
# -- ApplicationSet controller name string
@ -3346,6 +3376,13 @@ applicationSet:
# - argocd-applicationset.example.com
# -- Enable ApplicationSet in any namespace feature
allowAnyNamespace: false
# Default ApplicationSet controller's network policy
networkPolicy:
# -- Default network policy rules used by ApplicationSet controller
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
## Notifications controller
notifications:
# -- Enable notifications controller
@ -3915,6 +3952,12 @@ notifications:
# defaultTriggers: |
# - on-sync-status-unknown
# Default notifications controller's network policy
networkPolicy:
# -- Default network policy rules used by notifications controller
# @default -- `false` (defaults to global.networkPolicy.create)
create: false
commitServer:
# -- Enable commit server
enabled: false
@ -3983,6 +4026,10 @@ commitServer:
annotations: {}
# -- commit server service labels
labels: {}
# -- commit server service port
port: 8086
# -- commit server service port name
portName: server
# -- Automount API credentials for the Service Account into the pod.
automountServiceAccountToken: false
@ -4097,3 +4144,9 @@ commitServer:
# -- Priority class for the commit server pods
# @default -- `""` (defaults to global.priorityClassName)
priorityClassName: ""
# Default commit server's network policy
networkPolicy:
# -- Default network policy rules used by commit server
# @default -- `false` (defaults to global.networkPolicy.create)
create: false

View File

@ -1,8 +1,8 @@
apiVersion: v2
appVersion: v1.9.6
appVersion: v1.9.7
description: A Helm chart for Argo Events, the event-driven workflow automation framework
name: argo-events
version: 2.4.15
version: 2.4.16
home: https://github.com/argoproj/argo-helm
icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4
keywords:
@ -19,4 +19,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Bump argo-events to v1.9.6
description: Bump argo-events to v1.9.7

View File

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v1.8.3
description: A Helm chart for Argo Rollouts
name: argo-rollouts
version: 2.39.6
version: 2.40.3
home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
keywords:
@ -18,5 +18,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Bump argo-rollouts to v1.8.3
- kind: added
description: support dnsConfig for controller and dashboard pods

View File

@ -51,12 +51,14 @@ For full list of changes please check ArtifactHub [changelog].
| fullnameOverride | string | `nil` | String to fully override "argo-rollouts.fullname" template |
| global.deploymentAnnotations | object | `{}` | Annotations for all deployed Deployments |
| global.deploymentLabels | object | `{}` | Labels for all deployed Deployments |
| global.dnsConfig | object | `{}` | Specifies the deployment DNS configuration for controller and dashboard. |
| global.revisionHistoryLimit | int | `10` | Number of old deployment ReplicaSets to retain. The rest will be garbage collected. |
| imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry. Registry secret names as an array. |
| installCRDs | bool | `true` | Install and upgrade CRDs |
| keepCRDs | bool | `true` | Keep CRD's on helm uninstall |
| kubeVersionOverride | string | `""` | Override the Kubernetes version, which is used to evaluate certain manifests |
| nameOverride | string | `nil` | String to partially override "argo-rollouts.fullname" template |
| namespaceOverride | string | `.Release.Namespace` | Override the namespace |
| notifications.configmap.create | bool | `true` | Whether to create notifications configmap |
| notifications.notifiers | object | `{}` | Configures notification services |
| notifications.secret.annotations | object | `{}` | Annotations to be added to the notifications secret |

View File

@ -4,3 +4,5 @@ installCRDs: false
dashboard:
enabled: true
ingress:
enabled: true

View File

@ -417,3 +417,10 @@ Return the rules for controller's Role and ClusterRole
{{- end }}
{{- end }}
{{- end -}}
{{/*
Expand the namespace of the release.
*/}}
{{- define "argo-rollouts.namespace" -}}
{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- end }}

View File

@ -13,5 +13,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "argo-rollouts.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
{{- end }}

View File

@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: argo-rollouts-config
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -8,7 +8,7 @@ metadata:
{{- end }}
{{- end }}
name: {{ include "argo-rollouts.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
{{- range $key, $value := (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.controller.deploymentLabels) }}
{{ $key }}: {{ $value | quote }}
@ -112,6 +112,10 @@ spec:
tolerations:
{{- toYaml .Values.controller.tolerations | nindent 8 }}
{{- end }}
{{- with .Values.global.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.controller.affinity }}
affinity:
{{- toYaml .Values.controller.affinity | nindent 8 }}

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "argo-rollouts.fullname" . }}-metrics
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: argo-rollouts-notification-configmap
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: argo-rollouts-notification-secret
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
{{- with .Values.notifications.secret.annotations }}
annotations:
{{- range $key, $value := . }}

View File

@ -3,7 +3,7 @@ apiVersion: {{ include "argo-rollouts.podDisruptionBudget.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
name: {{ template "argo-rollouts.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
{{- include "argo-rollouts.labels" . | nindent 4 }}
{{- with .Values.controller.pdb.labels }}

View File

@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "argo-rollouts.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "argo-rollouts.fullname" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}
@ -14,5 +14,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "argo-rollouts.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
{{- end }}

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "argo-rollouts.serviceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "argo-rollouts.fullname" . }}
namespace: {{ default .Release.Namespace .Values.controller.metrics.serviceMonitor.namespace | quote }}
namespace: {{ default (include "argo-rollouts.namespace" .) .Values.controller.metrics.serviceMonitor.namespace | quote }}
labels:
app.kubernetes.io/component: {{ .Values.controller.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -13,5 +13,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ include "argo-rollouts.serviceAccountName" . }}-dashboard
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
{{- end }}

View File

@ -9,7 +9,7 @@ metadata:
{{- end }}
{{- end }}
name: {{ include "argo-rollouts.fullname" . }}-dashboard
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
{{- range $key, $value := (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.dashboard.deploymentLabels) }}
{{ $key }}: {{ $value | quote }}
@ -81,6 +81,10 @@ spec:
tolerations:
{{- toYaml .Values.dashboard.tolerations | nindent 8 }}
{{- end }}
{{- with .Values.global.dnsConfig }}
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.dashboard.affinity }}
affinity:
{{- toYaml .Values.dashboard.affinity | nindent 8 }}

View File

@ -14,7 +14,7 @@ metadata:
{{- end }}
{{- end }}
name: {{ template "argo-rollouts.fullname" . }}-dashboard
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
{{- include "argo-rollouts.labels" . | nindent 4 }}
{{- if .Values.dashboard.ingress.labels }}
@ -45,10 +45,10 @@ spec:
service:
name: {{ $serviceName }}
port:
{{- if kindIs "float64" $servicePort }}
number: {{ $servicePort }}
{{- else }}
{{- if kindIs "string" $servicePort }}
name: {{ $servicePort }}
{{- else }}
number: {{ $servicePort }}
{{- end }}
{{- else }}
serviceName: {{ $serviceName }}
@ -72,10 +72,10 @@ spec:
service:
name: {{ $serviceName }}
port:
{{- if kindIs "float64" $servicePort }}
number: {{ $servicePort }}
{{- else }}
{{- if kindIs "string" $servicePort }}
name: {{ $servicePort }}
{{- else }}
number: {{ $servicePort }}
{{- end }}
{{- else }}
serviceName: {{ $serviceName }}

View File

@ -3,7 +3,7 @@ apiVersion: {{ include "argo-rollouts.podDisruptionBudget.apiVersion" . }}
kind: PodDisruptionBudget
metadata:
name: {{ template "argo-rollouts.fullname" . }}-dashboard
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
{{- include "argo-rollouts.labels" . | nindent 4 }}
{{- with .Values.dashboard.pdb.labels }}

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ include "argo-rollouts.fullname" . }}-dashboard
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.dashboard.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -3,7 +3,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "argo-rollouts.serviceAccountName" . }}-dashboard
namespace: {{ .Release.Namespace | quote }}
namespace: {{ include "argo-rollouts.namespace" . | quote }}
labels:
app.kubernetes.io/component: {{ .Values.dashboard.component }}
{{- include "argo-rollouts.labels" . | nindent 4 }}

View File

@ -15,6 +15,10 @@ nameOverride:
# -- String to fully override "argo-rollouts.fullname" template
fullnameOverride:
# -- Override the namespace
# @default -- `.Release.Namespace`
namespaceOverride: ""
## Override APIVersions
## If you want to template helm charts but cannot access k8s API server
## you can set api versions here
@ -45,6 +49,18 @@ global:
deploymentLabels: {}
# -- Number of old deployment ReplicaSets to retain. The rest will be garbage collected.
revisionHistoryLimit: 10
# -- Specifies the deployment DNS configuration for controller and dashboard.
dnsConfig: {}
# nameservers:
# - 1.2.3.4
# searches:
# - ns1.svc.cluster-domain.example
# - my.dns.search.suffix
# options:
# - name: ndots
# value: "1"
# - name: attempts
# value: "3"
controller:
# -- Value of label `app.kubernetes.io/component`

View File

@ -1,9 +1,9 @@
apiVersion: v2
appVersion: v3.6.10
appVersion: v3.7.0
name: argo-workflows
description: A Helm chart for Argo Workflows
type: application
version: 0.45.18
version: 0.45.21
icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png
home: https://github.com/argoproj/argo-helm
sources:
@ -16,5 +16,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: fixed
description: Fix incorrect values note
- kind: changed
description: Bump argo-workflows to v3.7.0

View File

@ -187,6 +187,7 @@ Fields to note:
| controller.metricsConfig.port | int | `9090` | Port is the port where metrics are emitted |
| controller.metricsConfig.portName | string | `"metrics"` | Container metrics port name |
| controller.metricsConfig.relabelings | list | `[]` | ServiceMonitor relabel configs to apply to samples before scraping |
| controller.metricsConfig.scheme | string | `"http"` | serviceMonitor scheme |
| controller.metricsConfig.secure | bool | `false` | Flag that use a self-signed cert for TLS |
| controller.metricsConfig.servicePort | int | `8080` | Service metrics port |
| controller.metricsConfig.servicePortName | string | `"metrics"` | Service metrics port name |
@ -232,6 +233,7 @@ Fields to note:
| controller.telemetryConfig.metricsTTL | string | `""` | How often custom metrics are cleared from memory |
| controller.telemetryConfig.path | string | `"/telemetry"` | telemetry path |
| controller.telemetryConfig.port | int | `8081` | telemetry container port |
| controller.telemetryConfig.scheme | string | `"http"` | telemetry serviceMonitor scheme to use |
| controller.telemetryConfig.secure | bool | `false` | Flag that use a self-signed cert for TLS |
| controller.telemetryConfig.servicePort | int | `8081` | telemetry service port |
| controller.telemetryConfig.servicePortName | string | `"telemetry"` | telemetry service port name |

View File

@ -35,6 +35,7 @@ rules:
- ""
resources:
- configmaps
- namespaces
verbs:
- get
- watch

View File

@ -25,6 +25,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
honorLabels: {{ .Values.controller.metricsConfig.honorLabels }}
scheme: {{ .Values.controller.metricsConfig.scheme}}
{{- end }}
{{- if .Values.controller.telemetryConfig.enabled }}
- port: telemetry
@ -39,6 +40,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
honorLabels: {{ .Values.controller.metricsConfig.honorLabels }}
scheme: {{ .Values.controller.telemetryConfig.scheme }}
{{- end }}
{{- with .Values.controller.metricsConfig.targetLabels }}
targetLabels:

View File

@ -667,6 +667,25 @@ spec:
type: array
type: object
metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
finalizers:
items:
type: string
type: array
generateName:
type: string
labels:
additionalProperties:
type: string
type: object
name:
type: string
namespace:
type: string
type: object
workflowTemplateRef:
properties:

View File

@ -45,10 +45,10 @@ spec:
service:
name: {{ $serviceName }}
port:
{{- if kindIs "float64" $servicePort }}
number: {{ $servicePort }}
{{- else }}
{{- if kindIs "string" $servicePort }}
name: {{ $servicePort }}
{{- else }}
number: {{ $servicePort }}
{{- end }}
{{- else }}
serviceName: {{ $serviceName }}
@ -72,10 +72,10 @@ spec:
service:
name: {{ $serviceName }}
port:
{{- if kindIs "float64" $servicePort }}
number: {{ $servicePort }}
{{- else }}
{{- if kindIs "string" $servicePort }}
name: {{ $servicePort }}
{{- else }}
number: {{ $servicePort }}
{{- end }}
{{- else }}
serviceName: {{ $serviceName }}

View File

@ -149,6 +149,8 @@ controller:
servicePort: 8080
# -- Service metrics port name
servicePortName: metrics
# -- serviceMonitor scheme
scheme: http
# -- Flag to enable headless service
headlessService: false
# -- When true, honorLabels preserves the metrics labels when they collide with the targets labels.
@ -163,6 +165,7 @@ controller:
# -- ServiceMonitor will add labels from the service to the Prometheus metric
## Ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#servicemonitorspec
targetLabels: []
# -- the controller container's securityContext
securityContext:
readOnlyRootFilesystem: true
@ -256,6 +259,8 @@ controller:
servicePort: 8081
# -- telemetry service port name
servicePortName: telemetry
# -- telemetry serviceMonitor scheme to use
scheme: http
serviceMonitor:
# -- Enable a prometheus ServiceMonitor
enabled: false
@ -263,6 +268,7 @@ controller:
additionalLabels: {}
# -- Prometheus ServiceMonitor namespace
namespace: "" # "monitoring"
serviceAccount:
# -- Create a service account for the controller
create: true