Merge branch 'main' into feat-values-ha

Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
This commit is contained in:
Anton Gilgur 2023-09-09 16:11:03 -04:00 committed by GitHub
commit fb16cbf1df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 455 additions and 138 deletions

View file

@ -13,7 +13,7 @@ jobs:
options: --user 1001 options: --user 1001
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
- 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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with: with:
fetch-depth: 0 fetch-depth: 0

View file

@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with: with:
fetch-depth: 0 fetch-depth: 0

View file

@ -33,7 +33,7 @@ jobs:
steps: steps:
- name: "Checkout code" - name: "Checkout code"
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with: with:
persist-credentials: false persist-credentials: false
@ -60,7 +60,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab. # format to the repository Actions tab.
- name: "Upload artifact" - name: "Upload artifact"
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with: with:
name: SARIF file name: SARIF file
path: results.sarif path: results.sarif

View file

@ -1,9 +1,9 @@
apiVersion: v2 apiVersion: v2
appVersion: v2.8.0 appVersion: v2.8.3
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: 5.43.0 version: 5.46.0
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,5 @@ 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: changed - kind: added
description: Upgrade Argo CD to 2.8.0 description: added a toggle for the shared Helm working directory

View file

@ -42,7 +42,7 @@ repoServer:
minReplicas: 2 minReplicas: 2
applicationSet: applicationSet:
replicaCount: 2 replicas: 2
``` ```
### HA mode without autoscaling ### HA mode without autoscaling
@ -61,7 +61,7 @@ repoServer:
replicas: 2 replicas: 2
applicationSet: applicationSet:
replicaCount: 2 replicas: 2
``` ```
### Synchronizing Changes from Original Repository ### Synchronizing Changes from Original Repository
@ -383,8 +383,6 @@ NAME: my-release
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| apiVersionOverrides.autoscaling | string | `""` | String to override apiVersion of autoscaling rendered by this helm chart |
| apiVersionOverrides.certmanager | string | `""` | String to override apiVersion of cert-manager resources rendered by this helm chart |
| apiVersionOverrides.cloudgoogle | string | `""` | String to override apiVersion of GKE resources rendered by this helm chart | | apiVersionOverrides.cloudgoogle | string | `""` | String to override apiVersion of GKE resources rendered by this helm chart |
| crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs | | crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
| crds.annotations | object | `{}` | Annotations to be added to all CRDs | | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
@ -573,7 +571,7 @@ NAME: my-release
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| repoServer.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules to the deployment | | repoServer.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules to the deployment |
| repoServer.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. This is only available on HPA apiVersion `autoscaling/v2beta2` and newer | | repoServer.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. |
| repoServer.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the repo server | | repoServer.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the repo server |
| repoServer.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the repo server [HPA] | | repoServer.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the repo server [HPA] |
| repoServer.autoscaling.metrics | list | `[]` | Configures custom HPA metrics for the Argo CD repo server Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ | | repoServer.autoscaling.metrics | list | `[]` | Configures custom HPA metrics for the Argo CD repo server Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ |
@ -657,6 +655,7 @@ NAME: my-release
| repoServer.serviceAccount.name | string | `""` | Repo server service account name | | repoServer.serviceAccount.name | string | `""` | Repo server service account name |
| repoServer.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints | | repoServer.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints |
| repoServer.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the repo server | | repoServer.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the repo server |
| repoServer.useEphemeralHelmWorkingDir | bool | `true` | Toggle the usage of a ephemeral Helm working directory |
| repoServer.volumeMounts | list | `[]` | Additional volumeMounts to the repo server main container | | repoServer.volumeMounts | list | `[]` | Additional volumeMounts to the repo server main container |
| repoServer.volumes | list | `[]` | Additional volumes to the repo server pod | | repoServer.volumes | list | `[]` | Additional volumes to the repo server pod |
@ -671,7 +670,7 @@ NAME: my-release
| server.GKEmanagedCertificate.domains | list | `["argocd.example.com"]` | Domains for the Google Managed Certificate | | server.GKEmanagedCertificate.domains | list | `["argocd.example.com"]` | Domains for the Google Managed Certificate |
| server.GKEmanagedCertificate.enabled | bool | `false` | Enable ManagedCertificate custom resource for Google Kubernetes Engine. | | server.GKEmanagedCertificate.enabled | bool | `false` | Enable ManagedCertificate custom resource for Google Kubernetes Engine. |
| server.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules to the deployment | | server.affinity | object | `{}` (defaults to global.affinity preset) | Assign custom [affinity] rules to the deployment |
| server.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. This is only available on HPA apiVersion `autoscaling/v2beta2` and newer | | server.autoscaling.behavior | object | `{}` | Configures the scaling behavior of the target in both Up and Down directions. |
| server.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the Argo CD server | | server.autoscaling.enabled | bool | `false` | Enable Horizontal Pod Autoscaler ([HPA]) for the Argo CD server |
| server.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the Argo CD server [HPA] | | server.autoscaling.maxReplicas | int | `5` | Maximum number of replicas for the Argo CD server [HPA] |
| server.autoscaling.metrics | list | `[]` | Configures custom HPA metrics for the Argo CD server Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ | | server.autoscaling.metrics | list | `[]` | Configures custom HPA metrics for the Argo CD server Ref: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/ |
@ -942,7 +941,7 @@ server:
| redis.exporter.env | list | `[]` | Environment variables to pass to the Redis exporter | | redis.exporter.env | list | `[]` | Environment variables to pass to the Redis exporter |
| redis.exporter.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the redis-exporter | | redis.exporter.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the redis-exporter |
| redis.exporter.image.repository | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter | | redis.exporter.image.repository | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter |
| redis.exporter.image.tag | string | `"1.45.0"` | Tag to use for the redis-exporter | | redis.exporter.image.tag | string | `"1.53.0"` | Tag to use for the redis-exporter |
| redis.exporter.resources | object | `{}` | Resource limits and requests for redis-exporter sidecar | | redis.exporter.resources | object | `{}` | Resource limits and requests for redis-exporter sidecar |
| redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server | | redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server |
| redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod | | redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod |
@ -1000,17 +999,27 @@ The main options are listed here:
| Key | Type | Default | Description | | Key | Type | Default | Description |
|-----|------|---------|-------------| |-----|------|---------|-------------|
| redis-ha.additionalAffinities | object | `{}` | Additional affinities to add to the Redis server pods. |
| redis-ha.affinity | object | `{}` | Assign custom [affinity] rules to the Redis pods. |
| redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment | | redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment |
| redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar | | redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar |
| redis-ha.exporter.image | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter | | redis-ha.exporter.image | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter |
| redis-ha.exporter.tag | string | `"1.45.0"` | Tag to use for the redis-exporter | | redis-ha.exporter.tag | string | `"1.53.0"` | Tag to use for the redis-exporter |
| redis-ha.haproxy.additionalAffinities | object | `{}` | Additional affinities to add to the haproxy pods. |
| redis-ha.haproxy.affinity | object | `{}` | Assign custom [affinity] rules to the haproxy pods. |
| redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy | | redis-ha.haproxy.enabled | bool | `true` | Enabled HAProxy LoadBalancing/Proxy |
| redis-ha.haproxy.hardAntiAffinity | bool | `true` | Whether the haproxy pods should be forced to run on separate nodes. |
| redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping | | redis-ha.haproxy.metrics.enabled | bool | `true` | HAProxy enable prometheus metric scraping |
| redis-ha.haproxy.tolerations | list | `[]` | [Tolerations] for use with node taints for haproxy pods. |
| redis-ha.hardAntiAffinity | bool | `true` | Whether the Redis server pods should be forced to run on separate nodes. |
| redis-ha.image.repository | string | `"redis"` | Redis repository |
| redis-ha.image.tag | string | `"7.0.11-alpine"` | Redis tag | | redis-ha.image.tag | string | `"7.0.11-alpine"` | Redis tag |
| redis-ha.persistentVolume.enabled | bool | `false` | Configures persistence on Redis nodes | | redis-ha.persistentVolume.enabled | bool | `false` | Configures persistence on Redis nodes |
| redis-ha.redis.config | object | See [values.yaml] | Any valid redis config options in this section will be applied to each server (see `redis-ha` chart) | | redis-ha.redis.config | object | See [values.yaml] | Any valid redis config options in this section will be applied to each server (see `redis-ha` chart) |
| redis-ha.redis.config.save | string | `'""'` | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled | | redis-ha.redis.config.save | string | `'""'` | Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled |
| redis-ha.redis.masterGroupName | string | `"argocd"` | Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated | | redis-ha.redis.masterGroupName | string | `"argocd"` | Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated |
| redis-ha.tolerations | list | `[]` | [Tolerations] for use with node taints for Redis pods. |
| redis-ha.topologySpreadConstraints | object | `{"enabled":false,"maxSkew":"","topologyKey":"","whenUnsatisfiable":""}` | Assign custom [TopologySpreadConstraints] rules to the Redis pods. |
| redis-ha.topologySpreadConstraints.enabled | bool | `false` | Enable Redis HA topology spread constraints | | redis-ha.topologySpreadConstraints.enabled | bool | `false` | Enable Redis HA topology spread constraints |
| redis-ha.topologySpreadConstraints.maxSkew | string | `""` (defaults to `1`) | Max skew of pods tolerated | | redis-ha.topologySpreadConstraints.maxSkew | string | `""` (defaults to `1`) | Max skew of pods tolerated |
| redis-ha.topologySpreadConstraints.topologyKey | string | `""` (defaults to `topology.kubernetes.io/zone`) | Topology key for spread | | redis-ha.topologySpreadConstraints.topologyKey | string | `""` (defaults to `topology.kubernetes.io/zone`) | Topology key for spread |
@ -1113,7 +1122,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
| applicationSet.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] | | applicationSet.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
| applicationSet.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed | | applicationSet.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
| applicationSet.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out | | applicationSet.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
| applicationSet.replicaCount | int | `1` | The number of ApplicationSet controller pods to run | | applicationSet.replicas | int | `1` | The number of ApplicationSet controller pods to run |
| applicationSet.resources | object | `{}` | Resource limits and requests for the ApplicationSet controller pods. | | applicationSet.resources | object | `{}` | Resource limits and requests for the ApplicationSet controller pods. |
| applicationSet.service.annotations | object | `{}` | ApplicationSet service annotations | | applicationSet.service.annotations | object | `{}` | ApplicationSet service annotations |
| applicationSet.service.labels | object | `{}` | ApplicationSet service labels | | applicationSet.service.labels | object | `{}` | ApplicationSet service labels |

View file

@ -41,7 +41,7 @@ repoServer:
minReplicas: 2 minReplicas: 2
applicationSet: applicationSet:
replicaCount: 2 replicas: 2
``` ```
### HA mode without autoscaling ### HA mode without autoscaling
@ -60,7 +60,7 @@ repoServer:
replicas: 2 replicas: 2
applicationSet: applicationSet:
replicaCount: 2 replicas: 2
``` ```
### Synchronizing Changes from Original Repository ### Synchronizing Changes from Original Repository

View file

@ -73,6 +73,9 @@ DEPRECATED option configs.tlsCertsAnnotations - Use configs.tls.annotations
{{- if hasKey .Values.configs "tlsCerts" }} {{- if hasKey .Values.configs "tlsCerts" }}
DEPRECATED option configs.tlsCerts.data - Use configs.tls.certificates DEPRECATED option configs.tlsCerts.data - Use configs.tls.certificates
{{- end }} {{- end }}
{{- if .Values.applicationSet.replicaCount }}
DEPRECATED option applicationSet.replicaCount - Use applicationSet.replicas
{{- end }}
{{- if .Values.applicationSet.logFormat }} {{- if .Values.applicationSet.logFormat }}
DEPRECATED option applicationSet.logFormat - Use configs.params.applicationsetcontroller.log.format DEPRECATED option applicationSet.logFormat - Use configs.params.applicationsetcontroller.log.format
{{- end }} {{- end }}
@ -118,6 +121,12 @@ REMOVED option redis.containerPort - Use redis.containerPorts
{{- if .Values.redis.metrics.containerPort }} {{- if .Values.redis.metrics.containerPort }}
REMOVED option redis.metrics.containerPort - Use redis.containerPorts REMOVED option redis.metrics.containerPort - Use redis.containerPorts
{{- end }} {{- end }}
{{- if .Values.apiVersionOverrides.autoscaling }}
REMOVED option apiVersionOverrides.autoscaling - API autoscaling/v2 is GA from 1.23
{{- end }}
{{- if .Values.apiVersionOverrides.certmanager }}
REMOVED option apiVersionOverrides.certmanager - API v1 is only possible option after K8s 1.22
{{- end }}
In order to access the server UI you have the following options: In order to access the server UI you have the following options:

View file

@ -198,7 +198,7 @@ NOTE: Configuration keys must be stored as dict because YAML treats dot as separ
{{- end -}} {{- end -}}
{{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" -}} {{- range $component := tuple "applicationsetcontroller" "controller" "server" "reposerver" -}}
{{- $_ := 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.format" $component) $.Values.global.logging.format -}} {{- $_ := set $presets (printf "%s.log.level" $component) $.Values.global.logging.level -}}
{{- end -}} {{- end -}}
{{- if .Values.applicationSet.enabled -}} {{- if .Values.applicationSet.enabled -}}
{{- $_ := set $presets "applicationsetcontroller.enable.leader.election" (gt (.Values.applicationSet.replicaCount | int64) 1) -}} {{- $_ := set $presets "applicationsetcontroller.enable.leader.election" (gt (.Values.applicationSet.replicaCount | int64) 1) -}}

View file

@ -6,38 +6,6 @@ Return the target Kubernetes version
{{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }} {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }}
{{- end }} {{- end }}
{{/*
Return the appropriate apiVersion for autoscaling
*/}}
{{- define "argo-cd.apiVersion.autoscaling" -}}
{{- if .Values.apiVersionOverrides.autoscaling -}}
{{- print .Values.apiVersionOverrides.autoscaling -}}
{{- else if semverCompare "<1.23-0" (include "argo-cd.kubeVersion" .) -}}
{{- print "autoscaling/v2beta1" -}}
{{- else -}}
{{- print "autoscaling/v2" -}}
{{- end -}}
{{- end -}}
{{/*
Return the appropriate apiVersion for cert-manager
*/}}
{{- define "argo-cd.apiVersion.cert-manager" -}}
{{- if .Values.apiVersionOverrides.certmanager -}}
{{- print .Values.apiVersionOverrides.certmanager -}}
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1" -}}
{{- print "cert-manager.io/v1" -}}
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1beta1" -}}
{{- print "cert-manager.io/v1beta1" -}}
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha3" -}}
{{- print "cert-manager.io/v1alpha3" -}}
{{- else if .Capabilities.APIVersions.Has "cert-manager.io/v1alpha2" -}}
{{- print "cert-manager.io/v1alpha2" -}}
{{- else -}}
{{- print "certmanager.k8s.io/v1alpha1" -}}
{{- end -}}
{{- end -}}
{{/* {{/*
Return the appropriate apiVersion for GKE resources Return the appropriate apiVersion for GKE resources
*/}} */}}

View file

@ -23,6 +23,9 @@ spec:
metadata: metadata:
annotations: annotations:
checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }} checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }}
{{- if (hasKey .Values.server "configEnabled") | ternary .Values.server.configEnabled .Values.configs.cm.create }}
checksum/cm: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cm.yaml") . | sha256sum }}
{{- end }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.controller.podAnnotations) }} {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.controller.podAnnotations) }}
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}

View file

@ -1,5 +1,5 @@
{{- if .Values.applicationSet.certificate.enabled -}} {{- if .Values.applicationSet.certificate.enabled -}}
apiVersion: {{ include "argo-cd.apiVersion.cert-manager" . }} apiVersion: cert-manager.io/v1
kind: Certificate kind: Certificate
metadata: metadata:
{{- with (mergeOverwrite (deepCopy .Values.global.certificateAnnotations) .Values.applicationSet.certificate.annotations) }} {{- with (mergeOverwrite (deepCopy .Values.global.certificateAnnotations) .Values.applicationSet.certificate.annotations) }}

View file

@ -17,7 +17,7 @@ spec:
strategy: strategy:
{{- trim . | nindent 4 }} {{- trim . | nindent 4 }}
{{- end }} {{- end }}
replicas: {{ .Values.applicationSet.replicaCount }} replicas: {{ .Values.applicationSet.replicas | default .Values.applicationSet.replicaCount }}
revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }}
selector: selector:
matchLabels: matchLabels:

View file

@ -30,6 +30,9 @@ spec:
{{- if .Values.repoServer.certificateSecret.enabled }} {{- if .Values.repoServer.certificateSecret.enabled }}
checksum/repo-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-repo-server-tls-secret.yaml") . | sha256sum }} checksum/repo-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-repo-server-tls-secret.yaml") . | sha256sum }}
{{- end }} {{- end }}
{{- if (hasKey .Values.server "configEnabled") | ternary .Values.server.configEnabled .Values.configs.cm.create }}
checksum/cm: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cm.yaml") . | sha256sum }}
{{- end }}
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }} {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }}
{{- range $key, $value := . }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
@ -228,12 +231,14 @@ spec:
key: reposerver.enable.git.submodule key: reposerver.enable.git.submodule
name: argocd-cmd-params-cm name: argocd-cmd-params-cm
optional: true optional: true
{{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
- name: HELM_CACHE_HOME - name: HELM_CACHE_HOME
value: /helm-working-dir value: /helm-working-dir
- name: HELM_CONFIG_HOME - name: HELM_CONFIG_HOME
value: /helm-working-dir value: /helm-working-dir
- name: HELM_DATA_HOME - name: HELM_DATA_HOME
value: /helm-working-dir value: /helm-working-dir
{{- end }}
{{- with .Values.repoServer.envFrom }} {{- with .Values.repoServer.envFrom }}
envFrom: envFrom:
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
@ -252,8 +257,10 @@ spec:
name: gpg-keyring name: gpg-keyring
- mountPath: /app/config/reposerver/tls - mountPath: /app/config/reposerver/tls
name: argocd-repo-server-tls name: argocd-repo-server-tls
{{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
- mountPath: /helm-working-dir - mountPath: /helm-working-dir
name: helm-working-dir name: helm-working-dir
{{- end }}
- mountPath: /home/argocd/cmp-server/plugins - mountPath: /home/argocd/cmp-server/plugins
name: plugins name: plugins
- mountPath: /tmp - mountPath: /tmp
@ -346,8 +353,10 @@ spec:
{{- with .Values.repoServer.volumes }} {{- with .Values.repoServer.volumes }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
- name: helm-working-dir - name: helm-working-dir
emptyDir: {} emptyDir: {}
{{- end }}
- name: plugins - name: plugins
emptyDir: {} emptyDir: {}
- name: var-files - name: var-files

View file

@ -1,46 +1,38 @@
{{- if .Values.repoServer.autoscaling.enabled }} {{- if .Values.repoServer.autoscaling.enabled }}
apiVersion: {{ include "argo-cd.apiVersion.autoscaling" . }} apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
labels: name: {{ include "argo-cd.repoServer.fullname" . }}
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" (printf "%s-hpa" .Values.repoServer.name)) | nindent 4 }}
name: {{ template "argo-cd.repoServer.fullname" . }}-hpa
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
spec: spec:
scaleTargetRef: scaleTargetRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
name: {{ template "argo-cd.repoServer.fullname" . }} name: {{ include "argo-cd.repoServer.fullname" . }}
minReplicas: {{ .Values.repoServer.autoscaling.minReplicas }} minReplicas: {{ .Values.repoServer.autoscaling.minReplicas }}
maxReplicas: {{ .Values.repoServer.autoscaling.maxReplicas }} maxReplicas: {{ .Values.repoServer.autoscaling.maxReplicas }}
metrics: metrics:
{{- if .Values.repoServer.autoscaling.metrics }} {{- with .Values.repoServer.autoscaling.metrics }}
{{- toYaml .Values.repoServer.autoscaling.metrics | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- else }} {{- else }}
{{- with .Values.repoServer.autoscaling.targetMemoryUtilizationPercentage }} {{- with .Values.repoServer.autoscaling.targetMemoryUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: memory name: memory
{{- if eq (include "argo-cd.apiVersion.autoscaling" $) "autoscaling/v2beta1" }}
targetAverageUtilization: {{ . }}
{{- else }}
target: target:
averageUtilization: {{ . }}
type: Utilization type: Utilization
{{- end }} averageUtilization: {{ . }}
{{- end }} {{- end }}
{{- with .Values.repoServer.autoscaling.targetCPUUtilizationPercentage }} {{- with .Values.repoServer.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: cpu name: cpu
{{- if eq (include "argo-cd.apiVersion.autoscaling" $) "autoscaling/v2beta1" }}
targetAverageUtilization: {{ . }}
{{- else }}
target: target:
averageUtilization: {{ . }}
type: Utilization type: Utilization
{{- end }} averageUtilization: {{ . }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with .Values.repoServer.autoscaling.behavior }} {{- with .Values.repoServer.autoscaling.behavior }}
behavior: behavior:

View file

@ -1,5 +1,5 @@
{{- if .Values.server.certificate.enabled -}} {{- if .Values.server.certificate.enabled -}}
apiVersion: {{ include "argo-cd.apiVersion.cert-manager" . }} apiVersion: cert-manager.io/v1
kind: Certificate kind: Certificate
metadata: metadata:
{{- with (mergeOverwrite (deepCopy .Values.global.certificateAnnotations) .Values.server.certificate.annotations) }} {{- with (mergeOverwrite (deepCopy .Values.global.certificateAnnotations) .Values.server.certificate.annotations) }}

View file

@ -45,4 +45,16 @@ rules:
- list - list
- update - update
- watch - watch
- apiGroups:
- batch
resources:
- jobs
verbs:
- create
- apiGroups:
- argoproj.io
resources:
- workflows
verbs:
- create
{{- end }} {{- end }}

View file

@ -1,47 +1,39 @@
{{- if .Values.server.autoscaling.enabled }} {{- if .Values.server.autoscaling.enabled }}
apiVersion: {{ include "argo-cd.apiVersion.autoscaling" . }} apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler kind: HorizontalPodAutoscaler
metadata: metadata:
labels: name: {{ include "argo-cd.server.fullname" . }}
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" (printf "%s-hpa" .Values.server.name)) | nindent 4 }}
name: {{ template "argo-cd.server.fullname" . }}-hpa
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
spec: spec:
scaleTargetRef: scaleTargetRef:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
name: {{ template "argo-cd.server.fullname" . }} name: {{ include "argo-cd.server.fullname" . }}
minReplicas: {{ .Values.server.autoscaling.minReplicas }} minReplicas: {{ .Values.server.autoscaling.minReplicas }}
maxReplicas: {{ .Values.server.autoscaling.maxReplicas }} maxReplicas: {{ .Values.server.autoscaling.maxReplicas }}
metrics: metrics:
{{- if .Values.server.autoscaling.metrics }} {{- with .Values.server.autoscaling.metrics }}
{{ toYaml .Values.server.autoscaling.metrics | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- else }} {{- else }}
{{- with .Values.server.autoscaling.targetMemoryUtilizationPercentage }} {{- with .Values.server.autoscaling.targetMemoryUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: memory name: memory
{{- if eq (include "argo-cd.apiVersion.autoscaling" $) "autoscaling/v2beta1" }}
targetAverageUtilization: {{ . }}
{{- else }}
target: target:
averageUtilization: {{ . }}
type: Utilization type: Utilization
{{- end }} averageUtilization: {{ . }}
{{- end }} {{- end }}
{{- with .Values.server.autoscaling.targetCPUUtilizationPercentage }} {{- with .Values.server.autoscaling.targetCPUUtilizationPercentage }}
- type: Resource - type: Resource
resource: resource:
name: cpu name: cpu
{{- if eq (include "argo-cd.apiVersion.autoscaling" $) "autoscaling/v2beta1" }}
targetAverageUtilization: {{ . }}
{{- else }}
target: target:
averageUtilization: {{ . }}
type: Utilization type: Utilization
{{- end }} averageUtilization: {{ . }}
{{- end }}
{{- end }} {{- end }}
{{- end}}
{{- with .Values.server.autoscaling.behavior }} {{- with .Values.server.autoscaling.behavior }}
behavior: behavior:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}

View file

@ -39,7 +39,7 @@ spec:
{{- range $p := $paths }} {{- range $p := $paths }}
{{- if and $.Values.server.ingressGrpc.isAWSALB $.Values.server.ingressGrpc.enabled }} {{- if and $.Values.server.ingressGrpc.isAWSALB $.Values.server.ingressGrpc.enabled }}
- path: {{ $p }} - path: {{ $p }}
pathType: Prefix pathType: {{ $.Values.server.ingressGrpc.pathType }}
backend: backend:
service: service:
name: {{ template "argo-cd.server.fullname" $ }}-grpc name: {{ template "argo-cd.server.fullname" $ }}-grpc

View file

@ -12,12 +12,8 @@ kubeVersionOverride: ""
# If you want to template helm charts but cannot access k8s API server # If you want to template helm charts but cannot access k8s API server
# you can set api versions here # you can set api versions here
apiVersionOverrides: apiVersionOverrides:
# -- String to override apiVersion of cert-manager resources rendered by this helm chart
certmanager: "" # cert-manager.io/v1
# -- String to override apiVersion of GKE resources rendered by this helm chart # -- String to override apiVersion of GKE resources rendered by this helm chart
cloudgoogle: "" # cloud.google.com/v1 cloudgoogle: "" # cloud.google.com/v1
# -- String to override apiVersion of autoscaling rendered by this helm chart
autoscaling: "" # autoscaling/v2
# -- Create aggregated roles that extend existing cluster roles to interact with argo-cd resources # -- Create aggregated roles that extend existing cluster roles to interact with argo-cd resources
## Ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles ## Ref: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles
@ -476,7 +472,7 @@ configs:
# -- Repositories list to be used by applications # -- Repositories list to be used by applications
## Creates a secret for each key/value specified below to create repositories ## Creates a secret for each key/value specified below to create repositories
## Note: the last example in the list would use a repository credential template, configured under "configs.repositoryCredentials". ## Note: the last example in the list would use a repository credential template, configured under "configs.credentialTemplates".
repositories: {} repositories: {}
# istio-helm-repo: # istio-helm-repo:
# url: https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts # url: https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts
@ -543,7 +539,7 @@ configs:
## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/ ## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/
styles: "" styles: ""
# styles: | # styles: |
# .nav-bar { # .sidebar {
# background: linear-gradient(to bottom, #999, #777, #333, #222, #111); # background: linear-gradient(to bottom, #999, #777, #333, #222, #111);
# } # }
@ -1182,7 +1178,7 @@ redis:
# -- Repository to use for the redis-exporter # -- Repository to use for the redis-exporter
repository: public.ecr.aws/bitnami/redis-exporter repository: public.ecr.aws/bitnami/redis-exporter
# -- Tag to use for the redis-exporter # -- Tag to use for the redis-exporter
tag: 1.45.0 tag: 1.53.0
# -- Image pull policy for the redis-exporter # -- Image pull policy for the redis-exporter
# @default -- `""` (defaults to global.image.imagePullPolicy) # @default -- `""` (defaults to global.image.imagePullPolicy)
imagePullPolicy: "" imagePullPolicy: ""
@ -1375,12 +1371,17 @@ redis:
# -- Prometheus ServiceMonitor annotations # -- Prometheus ServiceMonitor annotations
annotations: {} annotations: {}
# This key configures Redis-HA subchart and when enabled (redis-ha.enabled=true) ## Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true`
# the custom redis deployment is omitted # Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml
# Check the redis-ha chart for more properties
redis-ha: redis-ha:
# -- Enables the Redis HA subchart and disables the custom Redis single node deployment # -- Enables the Redis HA subchart and disables the custom Redis single node deployment
enabled: false enabled: false
## Redis image
image:
# -- Redis repository
repository: redis
# -- Redis tag
tag: 7.0.11-alpine
## Prometheus redis-exporter sidecar ## Prometheus redis-exporter sidecar
exporter: exporter:
# -- Enable Prometheus redis-exporter sidecar # -- Enable Prometheus redis-exporter sidecar
@ -1388,10 +1389,11 @@ redis-ha:
# -- Repository to use for the redis-exporter # -- Repository to use for the redis-exporter
image: public.ecr.aws/bitnami/redis-exporter image: public.ecr.aws/bitnami/redis-exporter
# -- Tag to use for the redis-exporter # -- Tag to use for the redis-exporter
tag: 1.45.0 tag: 1.53.0
persistentVolume: persistentVolume:
# -- Configures persistence on Redis nodes # -- Configures persistence on Redis nodes
enabled: false enabled: false
## Redis specific configuration options
redis: redis:
# -- Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated # -- Redis convention for naming the cluster group: must match `^[\\w-\\.]+$` and can be templated
masterGroupName: argocd masterGroupName: argocd
@ -1401,16 +1403,35 @@ redis-ha:
# -- Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled # -- Will save the DB if both the given number of seconds and the given number of write operations against the DB occurred. `""` is disabled
# @default -- `'""'` # @default -- `'""'`
save: '""' save: '""'
## Enables a HA Proxy for better LoadBalancing / Sentinel Master support. Automatically proxies to Redis master.
haproxy: haproxy:
# -- Enabled HAProxy LoadBalancing/Proxy # -- Enabled HAProxy LoadBalancing/Proxy
enabled: true enabled: true
metrics: metrics:
# -- HAProxy enable prometheus metric scraping # -- HAProxy enable prometheus metric scraping
enabled: true enabled: true
image: # -- Whether the haproxy pods should be forced to run on separate nodes.
# -- Redis tag hardAntiAffinity: true
tag: 7.0.11-alpine # -- Additional affinities to add to the haproxy pods.
additionalAffinities: {}
# -- Assign custom [affinity] rules to the haproxy pods.
affinity: {}
# -- [Tolerations] for use with node taints for haproxy pods.
tolerations: []
# -- Whether the Redis server pods should be forced to run on separate nodes.
hardAntiAffinity: true
# -- Additional affinities to add to the Redis server pods.
additionalAffinities: {}
# -- Assign custom [affinity] rules to the Redis pods.
affinity: {}
# -- [Tolerations] for use with node taints for Redis pods.
tolerations: []
# -- Assign custom [TopologySpreadConstraints] rules to the Redis pods.
## https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ ## https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
topologySpreadConstraints: topologySpreadConstraints:
# -- Enable Redis HA topology spread constraints # -- Enable Redis HA topology spread constraints
@ -1462,7 +1483,6 @@ server:
# -- Average memory utilization percentage for the Argo CD server [HPA] # -- Average memory utilization percentage for the Argo CD server [HPA]
targetMemoryUtilizationPercentage: 50 targetMemoryUtilizationPercentage: 50
# -- Configures the scaling behavior of the target in both Up and Down directions. # -- Configures the scaling behavior of the target in both Up and Down directions.
# This is only available on HPA apiVersion `autoscaling/v2beta2` and newer
behavior: {} behavior: {}
# scaleDown: # scaleDown:
# stabilizationWindowSeconds: 300 # stabilizationWindowSeconds: 300
@ -2032,7 +2052,6 @@ repoServer:
# -- Average memory utilization percentage for the repo server [HPA] # -- Average memory utilization percentage for the repo server [HPA]
targetMemoryUtilizationPercentage: 50 targetMemoryUtilizationPercentage: 50
# -- Configures the scaling behavior of the target in both Up and Down directions. # -- Configures the scaling behavior of the target in both Up and Down directions.
# This is only available on HPA apiVersion `autoscaling/v2beta2` and newer
behavior: {} behavior: {}
# scaleDown: # scaleDown:
# stabilizationWindowSeconds: 300 # stabilizationWindowSeconds: 300
@ -2158,6 +2177,9 @@ repoServer:
# - name: cmp-tmp # - name: cmp-tmp
# emptyDir: {} # emptyDir: {}
# -- Toggle the usage of a ephemeral Helm working directory
useEphemeralHelmWorkingDir: true
# -- Annotations to be added to repo server Deployment # -- Annotations to be added to repo server Deployment
deploymentAnnotations: {} deploymentAnnotations: {}
@ -2373,7 +2395,7 @@ applicationSet:
name: applicationset-controller name: applicationset-controller
# -- The number of ApplicationSet controller pods to run # -- The number of ApplicationSet controller pods to run
replicaCount: 1 replicas: 1
## ApplicationSet controller Pod Disruption Budget ## ApplicationSet controller Pod Disruption Budget
## Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/ ## Ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/

View file

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: v1.8.0 appVersion: v1.8.1
description: A Helm chart for Argo Events, the event-driven workflow automation framework description: A Helm chart for Argo Events, the event-driven workflow automation framework
name: argo-events name: argo-events
version: 2.4.0 version: 2.4.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4 icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4
keywords: keywords:
@ -19,6 +19,4 @@ annotations:
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: changed - kind: changed
description: Upgrade Argo Events to v1.8.0 description: Upgrade Argo Events to v1.8.1
- kind: added
description: Add managed namespace configuration

View file

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
appVersion: v1.5.1 appVersion: v1.6.0
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 2.31.5 version: 2.32.0
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
keywords: keywords:
@ -18,5 +18,5 @@ 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: changed
description: Add CI example for extra objects description: Upgrade Argo Rollouts to v1.6.0

View file

@ -98,6 +98,7 @@ For full list of changes please check ArtifactHub [changelog].
| controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor | | controller.metrics.serviceMonitor.additionalLabels | object | `{}` | Labels to be added to the ServiceMonitor |
| controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor | | controller.metrics.serviceMonitor.enabled | bool | `false` | Enable a prometheus ServiceMonitor |
| controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | MetricRelabelConfigs to apply to samples before ingestion | | controller.metrics.serviceMonitor.metricRelabelings | list | `[]` | MetricRelabelConfigs to apply to samples before ingestion |
| controller.metrics.serviceMonitor.namespace | string | `""` | Namespace to be used for the ServiceMonitor |
| controller.metrics.serviceMonitor.relabelings | list | `[]` | RelabelConfigs to apply to samples before scraping | | controller.metrics.serviceMonitor.relabelings | list | `[]` | RelabelConfigs to apply to samples before scraping |
| controller.nodeSelector | object | `{}` | [Node selector] | | controller.nodeSelector | object | `{}` | [Node selector] |
| controller.pdb.annotations | object | `{}` | Annotations to be added to controller [Pod Disruption Budget] | | controller.pdb.annotations | object | `{}` | Annotations to be added to controller [Pod Disruption Budget] |

View file

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

View file

@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.7.0 controller-gen.kubebuilder.io/version: v0.12.1
{{- if .Values.keepCRDs }} {{- if .Values.keepCRDs }}
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
@ -310,6 +310,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
suspend: suspend:
type: boolean type: boolean
template: template:
@ -372,6 +373,7 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
weight: weight:
format: int32 format: int32
type: integer type: integer
@ -418,10 +420,12 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
required: required:
- nodeSelectorTerms - nodeSelectorTerms
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
podAffinity: podAffinity:
properties: properties:
@ -453,6 +457,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -476,6 +481,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -519,6 +525,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -542,6 +549,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -583,6 +591,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -606,6 +615,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -649,6 +659,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -672,6 +683,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -717,6 +729,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -726,6 +739,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -741,6 +755,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -752,6 +767,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -767,6 +783,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -776,6 +793,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1316,6 +1334,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1325,6 +1344,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1340,6 +1360,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1351,6 +1372,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1366,6 +1388,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1375,6 +1398,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1889,6 +1913,7 @@ spec:
name: name:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
initContainers: initContainers:
items: items:
@ -1921,6 +1946,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1930,6 +1956,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1945,6 +1972,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1956,6 +1984,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1971,6 +2000,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1980,6 +2010,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -2628,6 +2659,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
matchLabelKeys: matchLabelKeys:
items: items:
type: string type: string
@ -2775,8 +2807,37 @@ spec:
properties: properties:
address: address:
type: string type: string
authentication:
properties:
sigv4:
properties:
profile:
type: string
region:
type: string
roleArn:
type: string
type: object
type: object
headers:
items:
properties:
key:
type: string
value:
type: string
required:
- key
- value
type: object
type: array
insecure:
type: boolean
query: query:
type: string type: string
timeout:
format: int64
type: integer
type: object type: object
skywalking: skywalking:
properties: properties:

View file

@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.7.0 controller-gen.kubebuilder.io/version: v0.12.1
{{- if .Values.keepCRDs }} {{- if .Values.keepCRDs }}
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
@ -306,6 +306,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
suspend: suspend:
type: boolean type: boolean
template: template:
@ -368,6 +369,7 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
weight: weight:
format: int32 format: int32
type: integer type: integer
@ -414,10 +416,12 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
required: required:
- nodeSelectorTerms - nodeSelectorTerms
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
podAffinity: podAffinity:
properties: properties:
@ -449,6 +453,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -472,6 +477,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -515,6 +521,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -538,6 +545,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -579,6 +587,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -602,6 +611,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -645,6 +655,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -668,6 +679,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -713,6 +725,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -722,6 +735,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -737,6 +751,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -748,6 +763,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -763,6 +779,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -772,6 +789,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1312,6 +1330,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1321,6 +1340,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1336,6 +1356,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1347,6 +1368,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1362,6 +1384,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1371,6 +1394,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1885,6 +1909,7 @@ spec:
name: name:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
initContainers: initContainers:
items: items:
@ -1917,6 +1942,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1926,6 +1952,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1941,6 +1968,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1952,6 +1980,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1967,6 +1996,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1976,6 +2006,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -2624,6 +2655,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
matchLabelKeys: matchLabelKeys:
items: items:
type: string type: string
@ -2771,8 +2803,37 @@ spec:
properties: properties:
address: address:
type: string type: string
authentication:
properties:
sigv4:
properties:
profile:
type: string
region:
type: string
roleArn:
type: string
type: object
type: object
headers:
items:
properties:
key:
type: string
value:
type: string
required:
- key
- value
type: object
type: array
insecure:
type: boolean
query: query:
type: string type: string
timeout:
format: int64
type: integer
type: object type: object
skywalking: skywalking:
properties: properties:

View file

@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.7.0 controller-gen.kubebuilder.io/version: v0.12.1
{{- if .Values.keepCRDs }} {{- if .Values.keepCRDs }}
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
@ -306,6 +306,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
suspend: suspend:
type: boolean type: boolean
template: template:
@ -368,6 +369,7 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
weight: weight:
format: int32 format: int32
type: integer type: integer
@ -414,10 +416,12 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
required: required:
- nodeSelectorTerms - nodeSelectorTerms
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
podAffinity: podAffinity:
properties: properties:
@ -449,6 +453,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -472,6 +477,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -515,6 +521,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -538,6 +545,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -579,6 +587,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -602,6 +611,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -645,6 +655,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -668,6 +679,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -713,6 +725,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -722,6 +735,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -737,6 +751,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -748,6 +763,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -763,6 +779,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -772,6 +789,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1312,6 +1330,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1321,6 +1340,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1336,6 +1356,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1347,6 +1368,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1362,6 +1384,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1371,6 +1394,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1885,6 +1909,7 @@ spec:
name: name:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
initContainers: initContainers:
items: items:
@ -1917,6 +1942,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1926,6 +1952,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1941,6 +1968,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1952,6 +1980,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1967,6 +1996,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1976,6 +2006,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -2624,6 +2655,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
matchLabelKeys: matchLabelKeys:
items: items:
type: string type: string
@ -2771,8 +2803,37 @@ spec:
properties: properties:
address: address:
type: string type: string
authentication:
properties:
sigv4:
properties:
profile:
type: string
region:
type: string
roleArn:
type: string
type: object
type: object
headers:
items:
properties:
key:
type: string
value:
type: string
required:
- key
- value
type: object
type: array
insecure:
type: boolean
query: query:
type: string type: string
timeout:
format: int64
type: integer
type: object type: object
skywalking: skywalking:
properties: properties:

View file

@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.7.0 controller-gen.kubebuilder.io/version: v0.12.1
{{- if .Values.keepCRDs }} {{- if .Values.keepCRDs }}
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
@ -158,6 +158,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
service: service:
properties: properties:
name: name:
@ -223,6 +224,7 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
weight: weight:
format: int32 format: int32
type: integer type: integer
@ -269,10 +271,12 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
required: required:
- nodeSelectorTerms - nodeSelectorTerms
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
podAffinity: podAffinity:
properties: properties:
@ -304,6 +308,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -327,6 +332,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -370,6 +376,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -393,6 +400,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -434,6 +442,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -457,6 +466,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -500,6 +510,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -523,6 +534,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -568,6 +580,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -577,6 +590,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -592,6 +606,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -603,6 +618,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -618,6 +634,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -627,6 +644,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1167,6 +1185,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1176,6 +1195,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1191,6 +1211,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1202,6 +1223,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1217,6 +1239,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1226,6 +1249,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1740,6 +1764,7 @@ spec:
name: name:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
initContainers: initContainers:
items: items:
@ -1772,6 +1797,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1781,6 +1807,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1796,6 +1823,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1807,6 +1835,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1822,6 +1851,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1831,6 +1861,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -2479,6 +2510,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
matchLabelKeys: matchLabelKeys:
items: items:
type: string type: string

View file

@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.7.0 controller-gen.kubebuilder.io/version: v0.12.1
{{- if .Values.keepCRDs }} {{- if .Values.keepCRDs }}
"helm.sh/resource-policy": keep "helm.sh/resource-policy": keep
{{- end }} {{- end }}
@ -118,6 +118,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
strategy: strategy:
properties: properties:
blueGreen: blueGreen:
@ -624,6 +625,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
service: service:
properties: properties:
name: name:
@ -742,6 +744,10 @@ spec:
type: string type: string
ingress: ingress:
type: string type: string
ingresses:
items:
type: string
type: array
rootService: rootService:
type: string type: string
servicePort: servicePort:
@ -759,7 +765,6 @@ spec:
- enabled - enabled
type: object type: object
required: required:
- ingress
- servicePort - servicePort
type: object type: object
ambassador: ambassador:
@ -1003,6 +1008,7 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
weight: weight:
format: int32 format: int32
type: integer type: integer
@ -1049,10 +1055,12 @@ spec:
type: object type: object
type: array type: array
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
required: required:
- nodeSelectorTerms - nodeSelectorTerms
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
podAffinity: podAffinity:
properties: properties:
@ -1084,6 +1092,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -1107,6 +1116,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -1150,6 +1160,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -1173,6 +1184,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -1214,6 +1226,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -1237,6 +1250,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -1280,6 +1294,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaceSelector: namespaceSelector:
properties: properties:
matchExpressions: matchExpressions:
@ -1303,6 +1318,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
namespaces: namespaces:
items: items:
type: string type: string
@ -1348,6 +1364,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1357,6 +1374,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1372,6 +1390,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1383,6 +1402,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1398,6 +1418,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -1407,6 +1428,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -1947,6 +1969,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -1956,6 +1979,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -1971,6 +1995,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -1982,6 +2007,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -1997,6 +2023,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -2006,6 +2033,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -2520,6 +2548,7 @@ spec:
name: name:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic
type: array type: array
initContainers: initContainers:
items: items:
@ -2552,6 +2581,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
fieldRef: fieldRef:
properties: properties:
apiVersion: apiVersion:
@ -2561,6 +2591,7 @@ spec:
required: required:
- fieldPath - fieldPath
type: object type: object
x-kubernetes-map-type: atomic
resourceFieldRef: resourceFieldRef:
properties: properties:
containerName: containerName:
@ -2576,6 +2607,7 @@ spec:
required: required:
- resource - resource
type: object type: object
x-kubernetes-map-type: atomic
secretKeyRef: secretKeyRef:
properties: properties:
key: key:
@ -2587,6 +2619,7 @@ spec:
required: required:
- key - key
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
required: required:
- name - name
@ -2602,6 +2635,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
prefix: prefix:
type: string type: string
secretRef: secretRef:
@ -2611,6 +2645,7 @@ spec:
optional: optional:
type: boolean type: boolean
type: object type: object
x-kubernetes-map-type: atomic
type: object type: object
type: array type: array
image: image:
@ -3259,6 +3294,7 @@ spec:
type: string type: string
type: object type: object
type: object type: object
x-kubernetes-map-type: atomic
matchLabelKeys: matchLabelKeys:
items: items:
type: string type: string
@ -3330,6 +3366,8 @@ spec:
- arn - arn
- name - name
type: object type: object
ingress:
type: string
loadBalancer: loadBalancer:
properties: properties:
arn: arn:
@ -3355,6 +3393,49 @@ spec:
- name - name
type: object type: object
type: object type: object
albs:
items:
properties:
canaryTargetGroup:
properties:
arn:
type: string
fullName:
type: string
name:
type: string
required:
- arn
- name
type: object
ingress:
type: string
loadBalancer:
properties:
arn:
type: string
fullName:
type: string
name:
type: string
required:
- arn
- name
type: object
stableTargetGroup:
properties:
arn:
type: string
fullName:
type: string
name:
type: string
required:
- arn
- name
type: object
type: object
type: array
availableReplicas: availableReplicas:
format: int32 format: int32
type: integer type: integer

View file

@ -132,6 +132,8 @@ controller:
serviceMonitor: serviceMonitor:
# -- Enable a prometheus ServiceMonitor # -- Enable a prometheus ServiceMonitor
enabled: false enabled: false
# -- Namespace to be used for the ServiceMonitor
namespace: ""
# -- Labels to be added to the ServiceMonitor # -- Labels to be added to the ServiceMonitor
additionalLabels: {} additionalLabels: {}
# -- Annotations to be added to the ServiceMonitor # -- Annotations to be added to the ServiceMonitor

View file

@ -1,9 +1,9 @@
apiVersion: v2 apiVersion: v2
appVersion: v3.4.9 appVersion: v3.4.11
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.32.2 version: 0.33.3
icon: https://argoproj.github.io/argo-workflows/assets/logo.png icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
sources: sources:

View file

@ -132,6 +132,7 @@ Fields to note:
| workflow.serviceAccount.create | bool | `false` | Specifies whether a service account should be created | | workflow.serviceAccount.create | bool | `false` | Specifies whether a service account should be created |
| workflow.serviceAccount.labels | object | `{}` | Labels applied to created service account | | workflow.serviceAccount.labels | object | `{}` | Labels applied to created service account |
| workflow.serviceAccount.name | string | `"argo-workflow"` | Service account which is used to run workflows | | workflow.serviceAccount.name | string | `"argo-workflow"` | Service account which is used to run workflows |
| workflow.serviceAccount.pullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry. Same format as `.Values.images.pullSecrets` |
### Workflow Controller ### Workflow Controller

View file

@ -17,5 +17,9 @@ metadata:
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with $.Values.workflow.serviceAccount.pullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 2 }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -47,7 +47,6 @@ rules:
- sso - sso
verbs: verbs:
- get - get
- update
- apiGroups: - apiGroups:
- "" - ""
resources: resources:
@ -71,8 +70,6 @@ rules:
- secrets - secrets
verbs: verbs:
- get - get
- list
- watch
{{- if and .Values.server.sso.enabled .Values.server.sso.rbac.enabled }} {{- if and .Values.server.sso.enabled .Values.server.sso.rbac.enabled }}
{{- with .Values.server.sso.rbac.secretWhitelist }} {{- with .Values.server.sso.rbac.secretWhitelist }}
resourceNames: {{- toYaml . | nindent 4 }} resourceNames: {{- toYaml . | nindent 4 }}

View file

@ -54,6 +54,8 @@ workflow:
annotations: {} annotations: {}
# -- Service account which is used to run workflows # -- Service account which is used to run workflows
name: "argo-workflow" name: "argo-workflow"
# -- Secrets with credentials to pull images from a private registry. Same format as `.Values.images.pullSecrets`
pullSecrets: []
rbac: rbac:
# -- Adds Role and RoleBinding for the above specified service account to be able to run workflows. # -- Adds Role and RoleBinding for the above specified service account to be able to run workflows.
# A Role and Rolebinding pair is also created for each namespace in controller.workflowNamespaces (see below) # A Role and Rolebinding pair is also created for each namespace in controller.workflowNamespaces (see below)
@ -750,7 +752,7 @@ artifactRepository:
azure: {} azure: {}
# endpoint: https://mystorageaccountname.blob.core.windows.net # endpoint: https://mystorageaccountname.blob.core.windows.net
# container: my-container-name # container: my-container-name
# blob: path/in/container # blobNameFormat: path/in/container
## accountKeySecret is a secret selector. ## accountKeySecret is a secret selector.
## It references the k8s secret named 'my-azure-storage-credentials'. ## It references the k8s secret named 'my-azure-storage-credentials'.
## This secret is expected to have have the key 'account-access-key', ## This secret is expected to have have the key 'account-access-key',