Merge branch 'master' into master
This commit is contained in:
commit
2988f6fc94
25 changed files with 413 additions and 118 deletions
|
@ -1,8 +1,8 @@
|
|||
apiVersion: v2
|
||||
appVersion: 2.1.0
|
||||
appVersion: 2.1.1
|
||||
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 3.13.1
|
||||
version: 3.17.3
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argoproj.github.io/argo-cd/assets/logo.png
|
||||
keywords:
|
||||
|
@ -21,4 +21,4 @@ dependencies:
|
|||
condition: redis-ha.enabled
|
||||
annotations:
|
||||
artifacthub.io/changes: |
|
||||
- "[Fixed]: Updated README.md for ArgoCD"
|
||||
- "[Fixed]: use $ as context for repository secret labels"
|
||||
|
|
|
@ -36,7 +36,7 @@ Changes in the `CustomResourceDefinition` resources shall be fixed easily by cop
|
|||
|
||||
### 3.13.0
|
||||
|
||||
This release removes the flag `--staticassets` from argocd server as it has been dropped upstream. If this flag needs to be enabled e.g for older releases of ArgoCD, it can be passed via the `server.extraArgs` field
|
||||
This release removes the flag `--staticassets` from argocd server as it has been dropped upstream. If this flag needs to be enabled e.g for older releases of ArgoCD, it can be passed via the `server.extraArgs` field
|
||||
|
||||
### 3.10.2
|
||||
|
||||
|
@ -71,7 +71,7 @@ server:
|
|||
|
||||
Please check if you are affected by one of these cases **before you upgrade**, especially when you use **cloud IAM roles for service accounts.** (eg. IRSA on AWS or Workload Identity for GKE)
|
||||
|
||||
### 3.2.*
|
||||
### 3.2.*
|
||||
|
||||
With this minor version we introduced the evaluation for the ingress manifest (depending on the capabilities version), See [Pull Request](https://github.com/argoproj/argo-helm/pull/637).
|
||||
[Issue 703](https://github.com/argoproj/argo-helm/issues/703) reported that the capabilities evaluation is **not handled correctly when deploying the chart via an ArgoCD instance**,
|
||||
|
@ -81,7 +81,7 @@ If you are running a cluster version prior to `1.19` you can avoid this issue by
|
|||
|
||||
```yaml
|
||||
kubeVersionOverride: "1.18.0"
|
||||
```
|
||||
```
|
||||
|
||||
Then you should no longer encounter this issue.
|
||||
|
||||
|
@ -142,6 +142,8 @@ NAME: my-release
|
|||
| global.image.imagePullPolicy | If defined, a imagePullPolicy applied to all ArgoCD deployments. | `"IfNotPresent"` |
|
||||
| global.image.repository | If defined, a repository applied to all ArgoCD deployments. | `"argoproj/argocd"` |
|
||||
| global.image.tag | If defined, a tag applied to all ArgoCD deployments. | `"v2.0.5"` |
|
||||
| global.podAnnotations | Annotations for the all deployed pods |
|
||||
| global.podLabels | Labels for the all deployed pods |
|
||||
| global.securityContext | Toggle and define securityContext | See [values.yaml](values.yaml) |
|
||||
| global.imagePullSecrets | If defined, uses a Secret to pull an image from a private Docker registry or repository. | `[]` |
|
||||
| global.hostAliases | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | `[]` |
|
||||
|
@ -165,6 +167,9 @@ NAME: my-release
|
|||
| configs.secret.createSecret | Create the argocd-secret. | `true` |
|
||||
| configs.secret.githubSecret | GitHub incoming webhook secret | `""` |
|
||||
| configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` |
|
||||
| configs.repositoryCredentials | DEPRECATED: Instead, use configs.credentialTemplates and/or configs.repositories. | `{}` |
|
||||
| configs.credentialTemplates | Repository credentials to be used as Templates for other repos. | `{}` |
|
||||
| configs.repositories | Repositories list to be used by applications. | `{}` |
|
||||
| configs.tlsCertsAnnotations | TLS certificate configmap annotations | `{}` |
|
||||
| configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
|
||||
| configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
|
||||
|
@ -201,6 +206,8 @@ NAME: my-release
|
|||
| controller.metrics.service.servicePort | Metrics service port | `8082` |
|
||||
| controller.metrics.serviceMonitor.enabled | Enable a prometheus ServiceMonitor. | `false` |
|
||||
| controller.metrics.serviceMonitor.selector | Prometheus ServiceMonitor selector. | `{}` |
|
||||
| controller.metrics.serviceMonitor.relabelings | Prometheus [RelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) to apply to samples before scraping | `[]` |
|
||||
| controller.metrics.serviceMonitor.metricRelabelings | Prometheus [MetricRelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) to apply to samples before ingestion | `[]` |
|
||||
| controller.name | Controller name string. | `"application-controller"` |
|
||||
| controller.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
|
||||
| controller.podAnnotations | Annotations for the controller pods | `{}` |
|
||||
|
@ -253,6 +260,8 @@ NAME: my-release
|
|||
| repoServer.metrics.service.servicePort | Metrics service port | `8082` |
|
||||
| repoServer.metrics.serviceMonitor.enabled | Enable a prometheus ServiceMonitor. | `false` |
|
||||
| repoServer.metrics.serviceMonitor.selector | Prometheus ServiceMonitor selector. | `{}` |
|
||||
| repoServer.metrics.serviceMonitor.relabelings | Prometheus [RelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) to apply to samples before scraping | `[]` |
|
||||
| repoServer.metrics.serviceMonitor.metricRelabelings | Prometheus [MetricRelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) to apply to samples before ingestion | `[]` |
|
||||
| repoServer.name | Repo server name | `"repo-server"` |
|
||||
| repoServer.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
|
||||
| repoServer.podAnnotations | Annotations for the repo server pods | `{}` |
|
||||
|
@ -295,8 +304,10 @@ NAME: my-release
|
|||
| server.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
|
||||
| server.configAnnotations | ArgoCD configuration configmap annotations | `{}` |
|
||||
| server.config | [General Argo CD configuration](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#repositories) | See [values.yaml](values.yaml) |
|
||||
| server.config.repositories | [DEPRECATED: Instead, use configs.credentialTemplates and/or configs.repositories.](https://argo-cd.readthedocs.io/en/latest/operator-manual/declarative-setup/#legacy-behaviour) | See [values.yaml](values.yaml) |
|
||||
| server.containerPort | Server container port. | `8080` |
|
||||
| server.extraArgs | Additional arguments for the server. A list of flags. | `[]` |
|
||||
| server.extraContainers | Additional containers for the server. A list of containers. | `[]` |
|
||||
| server.staticAssets.enabled | Disable deprecated flag --staticassets | `false` |
|
||||
| server.env | Environment variables for the server. | `[]` |
|
||||
| server.envFrom | `envFrom` to pass to the server. | `[]` (See [values.yaml](values.yaml)) |
|
||||
|
@ -333,6 +344,8 @@ NAME: my-release
|
|||
| server.metrics.service.servicePort | Metrics service port | `8082` |
|
||||
| server.metrics.serviceMonitor.enabled | Enable a prometheus ServiceMonitor. | `false` |
|
||||
| server.metrics.serviceMonitor.selector | Prometheus ServiceMonitor selector. | `{}` |
|
||||
| server.metrics.serviceMonitor.relabelings | Prometheus [RelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) to apply to samples before scraping | `[]` |
|
||||
| server.metrics.serviceMonitor.metricRelabelings | Prometheus [MetricRelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) to apply to samples before ingestion | `[]` |
|
||||
| server.name | Argo CD server name | `"server"` |
|
||||
| server.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
|
||||
| server.podAnnotations | Annotations for the server pods | `{}` |
|
||||
|
@ -385,19 +398,35 @@ NAME: my-release
|
|||
| dex.metrics.service.labels | Metrics service labels | `{}` |
|
||||
| dex.metrics.serviceMonitor.enabled | Enable a prometheus ServiceMonitor. | `false` |
|
||||
| dex.metrics.serviceMonitor.selector | Prometheus ServiceMonitor selector. | `{}` |
|
||||
| dex.metrics.serviceMonitor.relabelings | Prometheus [RelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) to apply to samples before scraping | `[]` |
|
||||
| dex.metrics.serviceMonitor.metricRelabelings | Prometheus [MetricRelabelConfigs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) to apply to samples before ingestion | `[]` |
|
||||
| dex.name | Dex name | `"dex-server"` |
|
||||
| dex.env | Environment variables for the Dex server. | `[]` |
|
||||
| dex.envFrom | `envFrom` to pass to the Dex server. | `[]` (See [values.yaml](values.yaml)) |
|
||||
| dex.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
|
||||
| dex.podAnnotations | Annotations for the Dex server pods | `{}` |
|
||||
| dex.podLabels | Labels for the Dex server pods | `{}` |
|
||||
| dex.livenessProbe.enabled | Enable Kubernetes liveness probe for Dex >= 2.28.0 | `false` |
|
||||
| dex.livenessProbe.failureThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `3` |
|
||||
| dex.livenessProbe.initialDelaySeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |`10` |
|
||||
| dex.livenessProbe.periodSeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` |
|
||||
| dex.livenessProbe.successThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `1` |
|
||||
| dex.livenessProbe.timeoutSeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `1` |
|
||||
| dex.readinessProbe.enabled | Enable Kubernetes readiness probe for Dex >= 2.28.0 | `false` |
|
||||
| dex.readinessProbe.failureThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `3` |
|
||||
| dex.readinessProbe.initialDelaySeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) |`10` |
|
||||
| dex.readinessProbe.periodSeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` |
|
||||
| dex.readinessProbe.successThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `1` |
|
||||
| dex.readinessProbe.timeoutSeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `1` |
|
||||
| dex.priorityClassName | Priority class for dex | `""` |
|
||||
| dex.resources | Resource limits and requests for dex | `{}` |
|
||||
| dex.serviceAccount.automountServiceAccountToken | Automount API credentials for the Service Account | `true` |
|
||||
| dex.serviceAccount.create | Create dex service account | `true` |
|
||||
| dex.serviceAccount.name | Dex service account name | `"argocd-dex-server"` |
|
||||
| dex.servicePortGrpc | Server GRPC port | `5557` |
|
||||
| dex.servicePortGrpcName | Server GRPC port name | `grpc` |
|
||||
| dex.servicePortHttp | Server HTTP port | `5556` |
|
||||
| dex.servicePortHttpName | Server GRPC port name | `http` |
|
||||
| dex.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
|
||||
| dex.volumeMounts | Dex volume mounts | `"/shared"` |
|
||||
| dex.volumes | Dex volumes | `{}` |
|
||||
|
@ -445,14 +474,14 @@ through `xxx.extraArgs`
|
|||
|
||||
|
||||
### Using AWS ALB Ingress Controller With GRPC
|
||||
If you are using an AWS ALB Ingress controller, you will need to set `server.ingressGrpc.isAWSALB` to `true`. This will create a second service with the annotation `alb.ingress.kubernetes.io/backend-protocol-version: HTTP2` and modify the server ingress to add a condition annotation to route GRPC traffic to the new service.
|
||||
If you are using an AWS ALB Ingress controller, you will need to set `server.ingressGrpc.isAWSALB` to `true`. This will create a second service with the annotation `alb.ingress.kubernetes.io/backend-protocol-version: HTTP2` and modify the server ingress to add a condition annotation to route GRPC traffic to the new service.
|
||||
|
||||
Example:
|
||||
```yaml
|
||||
server:
|
||||
ingress:
|
||||
enabled: true
|
||||
annotations:
|
||||
annotations:
|
||||
alb.ingress.kubernetes.io/backend-protocol: HTTPS
|
||||
alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
|
||||
alb.ingress.kubernetes.io/scheme: internal
|
||||
|
@ -462,5 +491,5 @@ server:
|
|||
isAWSALB: true
|
||||
awsALB:
|
||||
serviceType: ClusterIP
|
||||
|
||||
|
||||
```
|
||||
|
|
|
@ -267,6 +267,12 @@ spec:
|
|||
type: string
|
||||
description: CommonLabels is a list of additional labels to add to rendered manifests
|
||||
type: object
|
||||
forceCommonAnnotations:
|
||||
description: ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps
|
||||
type: boolean
|
||||
forceCommonLabels:
|
||||
description: ForceCommonLabels specifies whether to force applying common labels to resources for Kustomize apps
|
||||
type: boolean
|
||||
images:
|
||||
description: Images is a list of Kustomize image override specifications
|
||||
items:
|
||||
|
@ -365,6 +371,10 @@ spec:
|
|||
properties:
|
||||
group:
|
||||
type: string
|
||||
jqPathExpressions:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
jsonPointers:
|
||||
items:
|
||||
type: string
|
||||
|
@ -376,7 +386,6 @@ spec:
|
|||
namespace:
|
||||
type: string
|
||||
required:
|
||||
- jsonPointers
|
||||
- kind
|
||||
type: object
|
||||
type: array
|
||||
|
@ -543,6 +552,12 @@ spec:
|
|||
type: string
|
||||
description: CommonLabels is a list of additional labels to add to rendered manifests
|
||||
type: object
|
||||
forceCommonAnnotations:
|
||||
description: ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps
|
||||
type: boolean
|
||||
forceCommonLabels:
|
||||
description: ForceCommonLabels specifies whether to force applying common labels to resources for Kustomize apps
|
||||
type: boolean
|
||||
images:
|
||||
description: Images is a list of Kustomize image override specifications
|
||||
items:
|
||||
|
@ -838,6 +853,12 @@ spec:
|
|||
type: string
|
||||
description: CommonLabels is a list of additional labels to add to rendered manifests
|
||||
type: object
|
||||
forceCommonAnnotations:
|
||||
description: ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps
|
||||
type: boolean
|
||||
forceCommonLabels:
|
||||
description: ForceCommonLabels specifies whether toforce applying common labels to resources for Kustomizeapps
|
||||
type: boolean
|
||||
images:
|
||||
description: Images is a list of Kustomize image override specifications
|
||||
items:
|
||||
|
@ -1134,6 +1155,12 @@ spec:
|
|||
type: string
|
||||
description: CommonLabels is a list of additional labels to add to rendered manifests
|
||||
type: object
|
||||
forceCommonAnnotations:
|
||||
description: ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps
|
||||
type: boolean
|
||||
forceCommonLabels:
|
||||
description: ForceCommonLabels specifies whether to force applying common labels to resources for Kustomize apps
|
||||
type: boolean
|
||||
images:
|
||||
description: Images is a list of Kustomize image override specifications
|
||||
items:
|
||||
|
@ -1412,6 +1439,12 @@ spec:
|
|||
type: string
|
||||
description: CommonLabels is a list of additional labels to add to rendered manifests
|
||||
type: object
|
||||
forceCommonAnnotations:
|
||||
description: ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps
|
||||
type: boolean
|
||||
forceCommonLabels:
|
||||
description: ForceCommonLabels specifies whether to force applying common labels to resources for Kustomize apps
|
||||
type: boolean
|
||||
images:
|
||||
description: Images is a list of Kustomize image override specifications
|
||||
items:
|
||||
|
@ -1687,6 +1720,12 @@ spec:
|
|||
type: string
|
||||
description: CommonLabels is a list of additional labels to add to rendered manifests
|
||||
type: object
|
||||
forceCommonAnnotations:
|
||||
description: ForceCommonAnnotations specifies whether to force applying common annotations to resources for Kustomize apps
|
||||
type: boolean
|
||||
forceCommonLabels:
|
||||
description: ForceCommonLabels specifies whether to force applying common labels to resources for Kustomize apps
|
||||
type: boolean
|
||||
images:
|
||||
description: Images is a list of Kustomize image override specifications
|
||||
items:
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
{{- if or .Values.configs.repositoryCredentials .Values.server.config.repositories }}
|
||||
WARNING: You are using configs.repositoryCredentials and/or server.config.repositories parameter that are DEPRECATED
|
||||
Instead, use configs.repositoryTemplates and/or configs.repositories parameters
|
||||
Read More about here: https://argo-cd.readthedocs.io/en/latest/operator-manual/declarative-setup/#legacy-behaviour
|
||||
|
||||
{{- end}}
|
||||
In order to access the server UI you have the following options:
|
||||
|
||||
1. kubectl port-forward service/{{include "argo-cd.fullname" . }}-server -n {{ .Release.Namespace }} 8080:443
|
||||
|
|
|
@ -17,17 +17,15 @@ spec:
|
|||
replicas: {{ .Values.controller.replicas }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.controller.podAnnotations }}
|
||||
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.controller.podAnnotations) }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.controller.podAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 8 }}
|
||||
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.controller.image.tag | quote }}
|
||||
{{- if .Values.controller.podLabels }}
|
||||
{{- toYaml .Values.controller.podLabels | nindent 8 }}
|
||||
{{- with (mergeOverwrite .Values.global.podLabels .Values.controller.podLabels) }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with .Values.global.imagePullSecrets }}
|
||||
|
@ -50,6 +48,8 @@ spec:
|
|||
- {{ .Values.controller.args.selfHealTimeout | quote }}
|
||||
- --repo-server
|
||||
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
|
||||
- --repo-server-timeout-seconds
|
||||
- {{ .Values.controller.args.repoServerTimeoutSeconds | quote }}
|
||||
- --logformat
|
||||
- {{ .Values.controller.logFormat }}
|
||||
- --loglevel
|
||||
|
@ -95,7 +95,10 @@ spec:
|
|||
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
|
||||
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
|
||||
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
|
||||
workingDir: /home/argocd
|
||||
volumeMounts:
|
||||
- name: argocd-home
|
||||
mountPath: /home/argocd
|
||||
- mountPath: /app/config/controller/tls
|
||||
name: argocd-repo-server-tls
|
||||
{{- with .Values.controller.volumeMounts }}
|
||||
|
@ -121,6 +124,8 @@ spec:
|
|||
{{ toYaml . | indent 6 }}
|
||||
{{- end }}
|
||||
volumes:
|
||||
- emptyDir: {}
|
||||
name: argocd-home
|
||||
- name: argocd-repo-server-tls
|
||||
secret:
|
||||
items:
|
||||
|
|
|
@ -3,16 +3,16 @@ apiVersion: monitoring.coreos.com/v1
|
|||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: {{ template "argo-cd.controller.fullname" . }}
|
||||
{{- if .Values.controller.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
|
||||
{{- with .Values.controller.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ . }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
|
||||
{{- if .Values.controller.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml .Values.controller.metrics.serviceMonitor.selector | nindent 4 }}
|
||||
{{- with .Values.controller.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }}
|
||||
{{- with .Values.controller.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
endpoints:
|
||||
|
@ -21,6 +21,14 @@ spec:
|
|||
interval: {{ . }}
|
||||
{{- end }}
|
||||
path: /metrics
|
||||
{{- with .Values.controller.metrics.serviceMonitor.relabelings }}
|
||||
relabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.controller.metrics.serviceMonitor.metricRelabelings }}
|
||||
metricRelabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Release.Namespace }}
|
||||
|
@ -28,4 +36,3 @@ spec:
|
|||
matchLabels:
|
||||
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.controller.name "name" "metrics") | nindent 6 }}
|
||||
{{- end }}
|
||||
|
||||
|
|
|
@ -10,4 +10,4 @@ data:
|
|||
{{- range $key, $value := .Values.configs.repositoryCredentials }}
|
||||
{{ $key }}: {{ $value | b64enc }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
|
@ -0,0 +1,14 @@
|
|||
{{- range $repo_cred_key, $repo_cred_value := .Values.configs.credentialTemplates }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: argocd-repo-creds-{{ $repo_cred_key }}
|
||||
labels:
|
||||
argocd.argoproj.io/secret-type: repo-creds
|
||||
{{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
|
||||
data:
|
||||
{{- range $key, $value := $repo_cred_value }}
|
||||
{{ $key }}: {{ $value | toString | b64enc }}
|
||||
{{- end }}
|
||||
{{- end }}
|
|
@ -0,0 +1,14 @@
|
|||
{{- range $repo_key, $repo_value := .Values.configs.repositories }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: argocd-repo-{{ $repo_key }}
|
||||
labels:
|
||||
argocd.argoproj.io/secret-type: repository
|
||||
{{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
|
||||
data:
|
||||
{{- range $key, $value := $repo_value }}
|
||||
{{ $key }}: {{ $value | b64enc }}
|
||||
{{- end }}
|
||||
{{- end }}
|
|
@ -16,17 +16,15 @@ spec:
|
|||
{{- end }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.repoServer.podAnnotations }}
|
||||
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.repoServer.podAnnotations) }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.repoServer.podAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 8 }}
|
||||
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.repoServer.image.tag | quote }}
|
||||
{{- if .Values.repoServer.podLabels }}
|
||||
{{- toYaml .Values.repoServer.podLabels | nindent 8 }}
|
||||
{{- with (mergeOverwrite .Values.global.podLabels .Values.repoServer.podLabels) }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with .Values.global.imagePullSecrets }}
|
||||
|
|
|
@ -3,16 +3,16 @@ apiVersion: monitoring.coreos.com/v1
|
|||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: {{ template "argo-cd.repoServer.fullname" . }}
|
||||
{{- if .Values.repoServer.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ .Values.repoServer.metrics.serviceMonitor.namespace }}
|
||||
{{- with .Values.repoServer.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ . }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
|
||||
{{- if .Values.repoServer.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml .Values.repoServer.metrics.serviceMonitor.selector | nindent 4 }}
|
||||
{{- with .Values.repoServer.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.repoServer.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml .Values.repoServer.metrics.serviceMonitor.additionalLabels | nindent 4 }}
|
||||
{{- with .Values.repoServer.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
endpoints:
|
||||
|
@ -21,6 +21,14 @@ spec:
|
|||
interval: {{ . }}
|
||||
{{- end }}
|
||||
path: /metrics
|
||||
{{- with .Values.repoServer.metrics.serviceMonitor.relabelings }}
|
||||
relabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.repoServer.metrics.serviceMonitor.metricRelabelings }}
|
||||
metricRelabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Release.Namespace }}
|
||||
|
@ -28,4 +36,3 @@ spec:
|
|||
matchLabels:
|
||||
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.repoServer.name "name" (printf "%s-metrics" .Values.repoServer.name)) | nindent 6 }}
|
||||
{{- end }}
|
||||
|
||||
|
|
|
@ -16,17 +16,15 @@ spec:
|
|||
{{- end }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.server.podAnnotations }}
|
||||
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.server.podAnnotations) }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.server.podAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 8 }}
|
||||
app.kubernetes.io/version: {{ default .Values.global.image.tag .Values.server.image.tag | quote }}
|
||||
{{- if .Values.server.podLabels }}
|
||||
{{- toYaml .Values.server.podLabels | nindent 8 }}
|
||||
{{- with (mergeOverwrite .Values.global.podLabels .Values.server.podLabels) }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with .Values.global.imagePullSecrets }}
|
||||
|
@ -42,6 +40,10 @@ spec:
|
|||
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.server.image.imagePullPolicy }}
|
||||
command:
|
||||
- argocd-server
|
||||
{{ if .Values.server.staticAssets.enabled }}
|
||||
- --staticassets
|
||||
- /shared/app
|
||||
{{ end }}
|
||||
- --repo-server
|
||||
- {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
|
||||
{{- if .Values.dex.enabled }}
|
||||
|
|
|
@ -8,19 +8,27 @@ metadata:
|
|||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
|
||||
{{- if .Values.server.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml .Values.server.metrics.serviceMonitor.selector | nindent 4 }}
|
||||
{{- with .Values.server.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.server.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml .Values.server.metrics.serviceMonitor.additionalLabels | nindent 4 }}
|
||||
{{- with .Values.server.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
endpoints:
|
||||
- port: metrics
|
||||
{{- with .Values.controller.metrics.serviceMonitor.interval }}
|
||||
{{- with .Values.server.metrics.serviceMonitor.interval }}
|
||||
interval: {{ . }}
|
||||
{{- end }}
|
||||
path: /metrics
|
||||
{{- with .Values.server.metrics.serviceMonitor.relabelings }}
|
||||
relabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.server.metrics.serviceMonitor.metricRelabelings }}
|
||||
metricRelabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Release.Namespace }}
|
||||
|
@ -28,4 +36,3 @@ spec:
|
|||
matchLabels:
|
||||
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.server.name "name" (printf "%s-metrics" .Values.server.name)) | nindent 6 }}
|
||||
{{- end }}
|
||||
|
||||
|
|
|
@ -12,17 +12,15 @@ spec:
|
|||
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.dex.name) | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.dex.podAnnotations }}
|
||||
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.dex.podAnnotations) }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.dex.podAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 8 }}
|
||||
app.kubernetes.io/version: {{ .Values.dex.image.tag | quote }}
|
||||
{{- if .Values.dex.podLabels }}
|
||||
{{- toYaml .Values.dex.podLabels | nindent 8 }}
|
||||
{{- with (mergeOverwrite .Values.global.podLabels .Values.dex.podLabels) }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with .Values.global.imagePullSecrets }}
|
||||
|
@ -73,10 +71,26 @@ spec:
|
|||
- name: grpc
|
||||
containerPort: {{ .Values.dex.containerPortGrpc }}
|
||||
protocol: TCP
|
||||
{{- if .Values.dex.metrics.enabled }}
|
||||
- name: metrics
|
||||
containerPort: {{ .Values.dex.containerPortMetrics }}
|
||||
protocol: TCP
|
||||
{{- if .Values.dex.livenessProbe.enabled }}
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /healthz/live
|
||||
port: metrics
|
||||
{{- with .Values.dex.livenessProbe }}
|
||||
{{- omit . "enabled" | toYaml | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.dex.readinessProbe.enabled }}
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /healthz/ready
|
||||
port: metrics
|
||||
{{- with .Values.dex.readinessProbe }}
|
||||
{{- omit . "enabled" | toYaml | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
volumeMounts:
|
||||
- mountPath: /tmp
|
||||
|
|
|
@ -16,11 +16,11 @@ metadata:
|
|||
{{- end }}
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
- name: {{ .Values.dex.servicePortHttpName }}
|
||||
protocol: TCP
|
||||
port: {{ .Values.dex.servicePortHttp }}
|
||||
targetPort: http
|
||||
- name: grpc
|
||||
- name: {{ .Values.dex.servicePortGrpcName }}
|
||||
protocol: TCP
|
||||
port: {{ .Values.dex.servicePortGrpc }}
|
||||
targetPort: grpc
|
||||
|
|
|
@ -3,28 +3,36 @@ apiVersion: monitoring.coreos.com/v1
|
|||
kind: ServiceMonitor
|
||||
metadata:
|
||||
name: {{ template "argo-cd.dex.fullname" . }}
|
||||
{{- if .Values.dex.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ .Values.dex.metrics.serviceMonitor.namespace }}
|
||||
{{- with .Values.dex.metrics.serviceMonitor.namespace }}
|
||||
namespace: {{ . }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
|
||||
{{- if .Values.dex.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml .Values.dex.metrics.serviceMonitor.selector | nindent 4 }}
|
||||
{{- with .Values.dex.metrics.serviceMonitor.selector }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- if .Values.dex.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml .Values.dex.metrics.serviceMonitor.additionalLabels | nindent 4 }}
|
||||
{{- with .Values.dex.metrics.serviceMonitor.additionalLabels }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
endpoints:
|
||||
- port: metrics
|
||||
{{- with .Values.controller.metrics.serviceMonitor.interval }}
|
||||
{{- with .Values.dex.metrics.serviceMonitor.interval }}
|
||||
interval: {{ . }}
|
||||
{{- end }}
|
||||
path: /metrics
|
||||
{{- with .Values.dex.metrics.serviceMonitor.relabelings }}
|
||||
relabelings:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.dex.metrics.serviceMonitor.metricRelabelings }}
|
||||
metricRelabelings:
|
||||
{{- toYaml . |nindent 8 }}
|
||||
{{- end }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ .Release.Namespace }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
@ -13,17 +13,15 @@ spec:
|
|||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.redis.name }}
|
||||
template:
|
||||
metadata:
|
||||
{{- if .Values.redis.podAnnotations }}
|
||||
{{- with (mergeOverwrite .Values.global.podAnnotations .Values.redis.podAnnotations) }}
|
||||
annotations:
|
||||
{{- range $key, $value := .Values.redis.podAnnotations }}
|
||||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 8 }}
|
||||
app.kubernetes.io/version: {{ .Values.redis.image.tag | quote }}
|
||||
{{- if .Values.redis.podLabels }}
|
||||
{{- toYaml .Values.redis.podLabels | nindent 8 }}
|
||||
{{- with (mergeOverwrite .Values.global.podLabels .Values.redis.podLabels) }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with .Values.global.imagePullSecrets }}
|
||||
|
|
|
@ -8,8 +8,12 @@ kubeVersionOverride: ""
|
|||
global:
|
||||
image:
|
||||
repository: quay.io/argoproj/argocd
|
||||
tag: v2.1.0
|
||||
tag: v2.1.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
## Annotations applied to all pods
|
||||
podAnnotations: {}
|
||||
## Labels applied to all pods
|
||||
podLabels: {}
|
||||
securityContext: {}
|
||||
# runAsUser: 999
|
||||
# runAsGroup: 999
|
||||
|
@ -57,6 +61,7 @@ controller:
|
|||
operationProcessors: "10"
|
||||
appResyncPeriod: "180"
|
||||
selfHealTimeout: "5"
|
||||
repoServerTimeoutSeconds: "60"
|
||||
|
||||
## Argo controller log format: text|json
|
||||
logFormat: text
|
||||
|
@ -97,6 +102,7 @@ controller:
|
|||
# drop:
|
||||
# - all
|
||||
# readOnlyRootFilesystem: true
|
||||
# runAsNonRoot: true
|
||||
|
||||
## Configures the controller port
|
||||
containerPort: 8082
|
||||
|
@ -165,6 +171,8 @@ controller:
|
|||
serviceMonitor:
|
||||
enabled: false
|
||||
interval: 30s
|
||||
relabelings: []
|
||||
metricRelabelings: []
|
||||
# selector:
|
||||
# prometheus: kube-prometheus
|
||||
# namespace: monitoring
|
||||
|
@ -226,6 +234,8 @@ dex:
|
|||
serviceMonitor:
|
||||
enabled: false
|
||||
interval: 30s
|
||||
relabelings: []
|
||||
metricRelabelings: []
|
||||
# selector:
|
||||
# prometheus: kube-prometheus
|
||||
# namespace: monitoring
|
||||
|
@ -259,6 +269,23 @@ dex:
|
|||
##
|
||||
podLabels: {}
|
||||
|
||||
## Probes for Dex server
|
||||
## Supported from Dex >= 2.28.0
|
||||
livenessProbe:
|
||||
enabled: false
|
||||
failureThreshold: 3
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
readinessProbe:
|
||||
enabled: false
|
||||
failureThreshold: 3
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 10
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 1
|
||||
|
||||
serviceAccount:
|
||||
create: true
|
||||
name: argocd-dex-server
|
||||
|
@ -280,8 +307,10 @@ dex:
|
|||
## Dex deployment container ports
|
||||
containerPortHttp: 5556
|
||||
servicePortHttp: 5556
|
||||
servicePortHttpName: http
|
||||
containerPortGrpc: 5557
|
||||
servicePortGrpc: 5557
|
||||
servicePortGrpcName: grpc
|
||||
containerPortMetrics: 5558
|
||||
servicePortMetrics: 5558
|
||||
|
||||
|
@ -368,10 +397,8 @@ redis:
|
|||
|
||||
## Redis Pod specific security context
|
||||
securityContext:
|
||||
runAsUser: 1000
|
||||
runAsGroup: 1000
|
||||
fsGroup: 1000
|
||||
runAsNonRoot: true
|
||||
runAsUser: 999
|
||||
|
||||
serviceAccount:
|
||||
create: false
|
||||
|
@ -435,6 +462,10 @@ server:
|
|||
extraArgs: []
|
||||
# - --insecure
|
||||
|
||||
# This flag is used to either remove or pass the CLI flag --staticassets /shared/app to the argocd-server app
|
||||
staticAssets:
|
||||
enabled: true
|
||||
|
||||
## Environment variables to pass to argocd-server
|
||||
##
|
||||
env: []
|
||||
|
@ -553,6 +584,8 @@ server:
|
|||
serviceMonitor:
|
||||
enabled: false
|
||||
interval: 30s
|
||||
relabelings: []
|
||||
metricRelabelings: []
|
||||
# selector:
|
||||
# prometheus: kube-prometheus
|
||||
# namespace: monitoring
|
||||
|
@ -667,6 +700,8 @@ server:
|
|||
url: https://argocd.example.com
|
||||
# Argo CD instance label key
|
||||
application.instanceLabelKey: argocd.argoproj.io/instance
|
||||
|
||||
# DEPRECATED: Please instead use configs.credentialTemplates and configs.repositories
|
||||
# repositories: |
|
||||
# - url: git@github.com:group/repo.git
|
||||
# sshPrivateKeySecret:
|
||||
|
@ -678,6 +713,7 @@ server:
|
|||
# - type: helm
|
||||
# url: https://argoproj.github.io/argo-helm
|
||||
# name: argo
|
||||
|
||||
# oidc.config: |
|
||||
# name: AzureAD
|
||||
# issuer: https://login.microsoftonline.com/TENANT_ID/v2.0
|
||||
|
@ -938,6 +974,8 @@ repoServer:
|
|||
serviceMonitor:
|
||||
enabled: false
|
||||
interval: 30s
|
||||
relabelings: []
|
||||
metricRelabelings: []
|
||||
# selector:
|
||||
# prometheus: kube-prometheus
|
||||
# namespace: monitoring
|
||||
|
@ -1084,25 +1122,48 @@ configs:
|
|||
# +LB9LGh4OAp68ImTjqf6ioGKG0RBSznwME+r4nXtT1S/qLR6ASWUS4ViWRhbRlNK
|
||||
# XWyb96wrUlv+E8I=
|
||||
# -----END CERTIFICATE-----
|
||||
# Creates a secret with optional repository credentials
|
||||
repositoryCredentials:
|
||||
{}
|
||||
# sample-ssh-key: |
|
||||
# -----BEGIN RSA PRIVATE KEY-----
|
||||
# MIICXAIBAAKBgQCcmiVJXGUvL8zqWmRRETbCKgFadtjJ9WDQpSwiZzMiktpYBo0N
|
||||
# z0cThzGQfWqvdiJYEy72MrKCaSYssV3eHP5zTffk4VBDktNfdl1kgkOpqnh7tQO4
|
||||
# nBONRLzcK6KEbKUsmiTbW8Jb4UFYDhyyyveby7y3vYePmaRQIrlEenVfKwIDAQAB
|
||||
# AoGAbbg+WZjnt9jYzHWKhZX29LDzg8ty9oT6URT4yB3gIOAdJMFqQHuyg8cb/e0x
|
||||
# O0AcrfK623oHwgEj4vpeFwnfaBdtM5GfH9zaj6pnXV7VZc3oBHrBnHUgFT3NEYUe
|
||||
# tt6rtatIguBH61Aj/pyij9sOfF0xDj0s1nwFTbdHtZR/31kCQQDIwcVTqhKkDNW6
|
||||
# cvdz+Wt3v9x1wNg+VhZhyA/pKILz3+qtn3GogLrQqhpVi+Y7tdvEv9FvgKaCjUp8
|
||||
# 6Lfp6dDFAkEAx7HpQbXFdrtcveOi9kosKRDX1PT4zdhB08jAXGlV8jr0jkrZazVM
|
||||
# hV5rVCuu35Vh6x1fiyGwwiVsqhgWE+KPLwJAWrDemasM/LsnmjDxhJy6ZcBwsWlK
|
||||
# xu5Q8h9UwLmiXtVayNBsofh1bGpLtzWZ7oN7ImidDkgJ8JQvgDoJS0xrGQJBALPJ
|
||||
# FkMFnrjtqGqBVkc8shNqyZY90v6oM2OzupO4dht2PpUZCDPAMZtlTWXjSjabbCPc
|
||||
# NxexBk1UmkdtFftjHxsCQGjG+nhRYH92MsmrbvZyFzgxg9SIOu6xel7D3Dq9l5Le
|
||||
# XG+bpHPF4SiCpAxthP5WNa17zuvk+CDsMZgZNuhYNMo=
|
||||
# -----END RSA PRIVATE KEY-----
|
||||
## # Creates a secret with optional repository credentials
|
||||
## DEPRECATED: Instead, use configs.credentialTemplates and/or configs.repositories
|
||||
repositoryCredentials: {}
|
||||
|
||||
## Creates a secret for each key/value specified below to create repository credentials
|
||||
credentialTemplates: {}
|
||||
# github-enterprise-creds-1:
|
||||
# url: https://github.com/argoproj
|
||||
# githubAppID: 1
|
||||
# githubAppInstallationID: 2
|
||||
# githubAppEnterpriseBaseUrl: https://ghe.example.com/api/v3
|
||||
# githubAppPrivateKey: |
|
||||
# -----BEGIN OPENSSH PRIVATE KEY-----
|
||||
# ...
|
||||
# -----END OPENSSH PRIVATE KEY-----
|
||||
# https-creds:
|
||||
# url: https://github.com/argoproj
|
||||
# password: my-password
|
||||
# username: my-username
|
||||
# ssh-creds:
|
||||
# url: git@github.com:argoproj-labs
|
||||
# sshPrivateKey: |
|
||||
# -----BEGIN OPENSSH PRIVATE KEY-----
|
||||
# ...
|
||||
# -----END OPENSSH PRIVATE KEY-----
|
||||
|
||||
## 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".
|
||||
repositories: {}
|
||||
# istio-helm-repo:
|
||||
# url: https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts
|
||||
# name: istio.io
|
||||
# type: helm
|
||||
# private-helm-repo:
|
||||
# url: https://my-private-chart-repo.internal
|
||||
# name: private-repo
|
||||
# type: helm
|
||||
# password: my-password
|
||||
# username: my-username
|
||||
# private-repo:
|
||||
# url: https://github.com/argoproj/private-repo
|
||||
|
||||
secret:
|
||||
createSecret: true
|
||||
## Annotations to be added to argocd-secret
|
||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
name: argocd-applicationset
|
||||
description: A Helm chart for installing ArgoCD ApplicationSet
|
||||
type: application
|
||||
version: 1.3.0
|
||||
version: 1.3.1
|
||||
appVersion: "v0.2.0"
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argocd-applicationset.readthedocs.io/en/stable/assets/logo.png
|
||||
|
@ -14,5 +14,4 @@ maintainers:
|
|||
- name: maruina
|
||||
annotations:
|
||||
artifacthub.io/changes: |
|
||||
- "[Fixed]: Use new image repository"
|
||||
- "[Changed]: Updated ApplicationSet CRD"
|
||||
- "[Changed]: Update README and convert it to helm-docs"
|
||||
|
|
|
@ -57,34 +57,38 @@ kubectl apply -k https://github.com/argoproj-labs/applicationset.git/manifests/c
|
|||
| Key | Type | Default | Description |
|
||||
|-----|------|---------|-------------|
|
||||
| affinity | object | `{}` | [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
|
||||
| args.metricsAddr | int | `8080` | The default metric address |
|
||||
| args.probeBindAddr | int | `8081` | The default health check port |
|
||||
| args.enableLeaderElection | bool | `false` | The default leader election setting |
|
||||
| args.namespace | string | `argocd` | The default Argo CD repo namespace |
|
||||
| args.argocdRepoServer | string | `argocd-repo-server:8081` | The default Argo CD repo server address |
|
||||
| args.policy | string | `sync` | How application is synced between the generator and the cluster |
|
||||
| args.argocdRepoServer | string | `"argocd-repo-server:8081"` | The default Argo CD repo server address |
|
||||
| args.debug | bool | `false` | Print debug logs |
|
||||
| args.dryRun | bool | `false` | Enable dry run mode |
|
||||
| args.enableLeaderElection | bool | `false` | The default leader election setting |
|
||||
| args.metricsAddr | string | `":8080"` | The default metric address |
|
||||
| args.namespace | string | `"argocd"` | The default Argo CD repo namespace |
|
||||
| args.policy | string | `"sync"` | How application is synced between the generator and the cluster |
|
||||
| args.probeBindAddr | string | `":8081"` | The default health check port |
|
||||
| extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) |
|
||||
| extraVolumes | list | `[]` | List of extra volumes to add |
|
||||
| fullnameOverride | string | `""` | Override the default fully qualified app name |
|
||||
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
|
||||
| image.repository | string | `"quay.io/argocdapplicationset/argocd-applicationset"` | If defined, a repository applied to the ApplicationSet deployment. |
|
||||
| image.repository | string | `"quay.io/argoproj/argocd-applicationset"` | The image repository |
|
||||
| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
|
||||
| imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. |
|
||||
| mountGPGKeyringVolume | bool | `true` | Mount an emptyDir volume for `gpg-keyring` |
|
||||
| mountGPGKeysVolume | bool | `false` | Mount the `argocd-gpg-keys-cm` volume |
|
||||
| mountSSHKnownHostsVolume | bool | `true` | Mount the `argocd-ssh-known-hosts-cm` volume |
|
||||
| mountTLSCertsVolume | bool | `true` | Mount the `argocd-tls-certs-cm` volume |
|
||||
| mountGPGKeysVolume | bool | `false` | Mount the `argocd-gpg-keys-cm` volume |
|
||||
| mountGPGKeyringVolume | bool | `true` | Mount an emptyDir volume for `gpg-keyring` |
|
||||
| nameOverride | string | `""` | Provide a name in place of `argocd-applicationset` |
|
||||
| nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
|
||||
| podAnnotations | object | `{}` | Annotations for the controller pods |
|
||||
| podSecurityContext | object | `{}` | Pod Security Context |
|
||||
| priorityClassName | string | `""` | If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default. |
|
||||
| rbac.pspEnabled | bool | `true` | Enable Pod Security Policy |
|
||||
| replicaCount | int | `1` | The number of controller pods to run |
|
||||
| resources | object | `{}` | Resource limits and requests for the controller pods. |
|
||||
| securityContext | object | `{}` | Security Context |
|
||||
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
|
||||
| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
|
||||
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
|
||||
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
|
||||
| tolerations | list | `[]` | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) |
|
||||
|
||||
----------------------------------------------
|
||||
Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
|
||||
|
|
57
charts/argocd-applicationset/README.md.gotmpl
Normal file
57
charts/argocd-applicationset/README.md.gotmpl
Normal file
|
@ -0,0 +1,57 @@
|
|||
# Argo CD ApplicationSet Chart
|
||||
|
||||
A Helm chart for Argo CD ApplicationSet, a controller to programmatically generate Argo CD Application.
|
||||
|
||||
Source code can be found [here](https://github.com/argoproj-labs/applicationset/)
|
||||
|
||||
## Additional Information
|
||||
|
||||
This is a **community maintained** chart. This chart installs the [applicationset](https://github.com/argoproj-labs/applicationset) controller.
|
||||
|
||||
This chart currently installs the non-HA version of Argo CD ApplicationSet.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- Helm v3.0.0+
|
||||
- The ApplicationSet controller **must** be installed into the same namespace as the Argo CD it is targetting.
|
||||
|
||||
## Installing the Chart
|
||||
|
||||
To install the chart with the release name `my-release`:
|
||||
|
||||
```console
|
||||
$ helm repo add argo https://argoproj.github.io/argo-helm
|
||||
"argo" has been added to your repositories
|
||||
|
||||
$ helm install --name my-release argo/argocd-applicationset
|
||||
NAME: my-release
|
||||
...
|
||||
```
|
||||
|
||||
### Testing
|
||||
|
||||
Users can test the chart with [kind](https://kind.sigs.k8s.io/) and [ct](https://github.com/helm/chart-testing).
|
||||
|
||||
```console
|
||||
kind create cluster
|
||||
kubectl create namespace argocd
|
||||
kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
|
||||
ct install --namespace argocd
|
||||
```
|
||||
|
||||
## Notes on CRD Installation
|
||||
|
||||
Some users would prefer to install the CRDs _outside_ of the chart. You can disable the CRD installation of this chart by using `--skip-crds` when installing the chart.
|
||||
|
||||
You then can install the CRDs manually from `crds` folder or via the manifests from the upstream project repo:
|
||||
|
||||
```console
|
||||
kubectl apply -k https://github.com/argoproj-labs/applicationset.git/manifests/crds?ref=<appVersion>
|
||||
|
||||
# Eg. version v0.1.0
|
||||
kubectl apply -k https://github.com/argoproj-labs/applicationset.git/manifests/crds?ref=v0.1.0
|
||||
```
|
||||
|
||||
{{ template "chart.valuesSection" . }}
|
||||
|
||||
{{ template "helm-docs.versionFooter" . }}
|
|
@ -2,47 +2,63 @@
|
|||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
|
||||
# -- The number of controller pods to run
|
||||
replicaCount: 1
|
||||
|
||||
image:
|
||||
# The image repository
|
||||
# -- The image repository
|
||||
repository: quay.io/argoproj/argocd-applicationset
|
||||
# Image pull policy
|
||||
# -- Image pull policy
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
# -- Overrides the image tag whose default is the chart appVersion.
|
||||
tag: ""
|
||||
|
||||
args:
|
||||
# -- The default metric address
|
||||
metricsAddr: :8080
|
||||
# -- The default health check port
|
||||
probeBindAddr: :8081
|
||||
# -- The default leader election setting
|
||||
enableLeaderElection: false
|
||||
# -- The default Argo CD repo namespace
|
||||
namespace: argocd
|
||||
# -- The default Argo CD repo server address
|
||||
argocdRepoServer: argocd-repo-server:8081
|
||||
# -- How application is synced between the generator and the cluster
|
||||
policy: sync
|
||||
# -- Print debug logs
|
||||
debug: false
|
||||
# -- Enable dry run mode
|
||||
dryRun: false
|
||||
|
||||
# -- If defined, uses a Secret to pull an image from a private Docker registry or repository.
|
||||
imagePullSecrets: []
|
||||
# -- Provide a name in place of `argocd-applicationset`
|
||||
nameOverride: ""
|
||||
# -- Override the default fully qualified app name
|
||||
fullnameOverride: ""
|
||||
|
||||
serviceAccount:
|
||||
# Specifies whether a service account should be created
|
||||
# -- Specifies whether a service account should be created
|
||||
create: true
|
||||
# Annotations to add to the service account
|
||||
# -- Annotations to add to the service account
|
||||
annotations: {}
|
||||
# The name of the service account to use.
|
||||
# -- The name of the service account to use.
|
||||
# If not set and create is true, a name is generated using the fullname template
|
||||
name: ""
|
||||
|
||||
# -- Annotations for the controller pods
|
||||
podAnnotations: {}
|
||||
|
||||
rbac:
|
||||
# -- Enable Pod Security Policy
|
||||
pspEnabled: true
|
||||
|
||||
# -- Pod Security Context
|
||||
podSecurityContext: {}
|
||||
# fsGroup: 2000
|
||||
|
||||
# -- Security Context
|
||||
securityContext: {}
|
||||
# capabilities:
|
||||
# drop:
|
||||
|
@ -51,6 +67,7 @@ securityContext: {}
|
|||
# runAsNonRoot: true
|
||||
# runAsUser: 1000
|
||||
|
||||
# -- Resource limits and requests for the controller pods.
|
||||
resources: {}
|
||||
# We usually recommend not to specify default resources and to leave this as a conscious
|
||||
# choice for the user. This also increases chances charts run on environments with little
|
||||
|
@ -63,23 +80,32 @@ resources: {}
|
|||
# cpu: 100m
|
||||
# memory: 128Mi
|
||||
|
||||
# -- [Node selector](https://kubernetes.io/docs/user-guide/node-selection/)
|
||||
nodeSelector: {}
|
||||
|
||||
# -- [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)
|
||||
tolerations: []
|
||||
|
||||
# -- [Assign custom affinity rules to the deployment](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)
|
||||
affinity: {}
|
||||
|
||||
# -- If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
|
||||
priorityClassName: ""
|
||||
|
||||
# -- Mount the `argocd-ssh-known-hosts-cm` volume
|
||||
mountSSHKnownHostsVolume: true
|
||||
# -- Mount the `argocd-tls-certs-cm` volume
|
||||
mountTLSCertsVolume: true
|
||||
# -- Mount the `argocd-gpg-keys-cm` volume
|
||||
mountGPGKeysVolume: false
|
||||
# -- Mount an emptyDir volume for `gpg-keyring`
|
||||
mountGPGKeyringVolume: true
|
||||
|
||||
# -- List of extra mounts to add (normally used with extraVolumes)
|
||||
extraVolumeMounts: []
|
||||
# - mountPath: /tmp/foobar
|
||||
# name: foobar
|
||||
|
||||
# -- List of extra volumes to add
|
||||
extraVolumes: []
|
||||
# - name: foobar
|
||||
|
|
|
@ -3,7 +3,7 @@ appVersion: 1.1.1
|
|||
description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
|
||||
name: argocd-notifications
|
||||
type: application
|
||||
version: 1.4.3
|
||||
version: 1.4.4
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argocd-notifications.readthedocs.io/en/stable/assets/logo.png
|
||||
keywords:
|
||||
|
@ -15,4 +15,4 @@ maintainers:
|
|||
- name: andyfeller
|
||||
annotations:
|
||||
artifacthub.io/changes: |
|
||||
- "[Fixed]: Use correct chart icon url"
|
||||
- "[Fixed]: Use correct names for ConfigMap and Secret"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ include "argocd-notifications.name" . }}-cm
|
||||
name: argocd-notifications-cm
|
||||
labels:
|
||||
{{- include "argocd-notifications.labels" . | nindent 4 }}
|
||||
data:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ include "argocd-notifications.name" . }}-secret
|
||||
name: argocd-notifications-secret
|
||||
labels:
|
||||
{{- include "argocd-notifications.labels" . | nindent 4 }}
|
||||
type: Opaque
|
||||
|
|
Loading…
Reference in a new issue