chore(argo-cd): Decouple Redis exporter from metrics service (#1791)
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
Petr Drastil
GitHub
parent
adc526612f
commit
b4de202859
4 changed files with 53 additions and 41 deletions
|
|
@ -3,7 +3,7 @@ appVersion: v2.5.7
|
|||
kubeVersion: ">=1.22.0-0"
|
||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 5.19.3
|
||||
version: 5.19.4
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||
sources:
|
||||
|
|
@ -23,4 +23,4 @@ dependencies:
|
|||
condition: redis-ha.enabled
|
||||
annotations:
|
||||
artifacthub.io/changes: |
|
||||
- "[Fixed]: Fixed invalid port on redis service"
|
||||
- "[Changed]: Decoupled redis metrics exporter from metrics service"
|
||||
|
|
|
|||
|
|
@ -864,6 +864,12 @@ server:
|
|||
| redis.enabled | bool | `true` | Enable redis |
|
||||
| redis.env | list | `[]` | Environment variables to pass to the Redis server |
|
||||
| redis.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the Redis server |
|
||||
| redis.exporter.containerSecurityContext | object | See [values.yaml] | Redis exporter security context |
|
||||
| redis.exporter.enabled | bool | `true` | Enable Prometheus redis-exporter sidecar |
|
||||
| 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"` | redis-exporter image repository |
|
||||
| redis.exporter.image.tag | string | `"1.26.0-debian-10-r2"` | redis-exporter image tag |
|
||||
| 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.extraContainers | list | `[]` | Additional containers to be added to the redis pod |
|
||||
| redis.image.imagePullPolicy | string | `"IfNotPresent"` | Redis imagePullPolicy |
|
||||
|
|
@ -871,12 +877,7 @@ server:
|
|||
| redis.image.tag | string | `"7.0.5-alpine"` | Redis tag |
|
||||
| redis.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
|
||||
| redis.initContainers | list | `[]` | Init containers to add to the redis pod |
|
||||
| redis.metrics.containerSecurityContext | object | See [values.yaml] | Redis exporter security context |
|
||||
| redis.metrics.enabled | bool | `false` | Deploy metrics service and redis-exporter sidecar |
|
||||
| redis.metrics.image.imagePullPolicy | string | `"IfNotPresent"` | redis-exporter image PullPolicy |
|
||||
| redis.metrics.image.repository | string | `"public.ecr.aws/bitnami/redis-exporter"` | redis-exporter image repository |
|
||||
| redis.metrics.image.tag | string | `"1.26.0-debian-10-r2"` | redis-exporter image tag |
|
||||
| redis.metrics.resources | object | `{}` | Resource limits and requests for redis-exporter sidecar |
|
||||
| redis.metrics.enabled | bool | `false` | Deploy metrics service |
|
||||
| redis.metrics.service.annotations | object | `{}` | Metrics service annotations |
|
||||
| redis.metrics.service.clusterIP | string | `"None"` | Metrics service clusterIP. `None` makes a "headless service" (no virtual IP) |
|
||||
| redis.metrics.service.labels | object | `{}` | Metrics service labels |
|
||||
|
|
|
|||
|
|
@ -73,10 +73,10 @@ spec:
|
|||
volumeMounts:
|
||||
{{- toYaml . | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- if .Values.redis.metrics.enabled }}
|
||||
{{- if .Values.redis.exporter.enabled }}
|
||||
- name: metrics
|
||||
image: {{ .Values.redis.metrics.image.repository }}:{{ .Values.redis.metrics.image.tag }}
|
||||
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.redis.metrics.image.imagePullPolicy }}
|
||||
image: {{ .Values.redis.exporter.image.repository }}:{{ .Values.redis.exporter.image.tag }}
|
||||
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.redis.exporter.image.imagePullPolicy }}
|
||||
env:
|
||||
- name: REDIS_ADDR
|
||||
value: {{ printf "redis://localhost:%v" .Values.redis.containerPorts.redis }}
|
||||
|
|
@ -87,9 +87,9 @@ spec:
|
|||
containerPort: {{ .Values.redis.containerPorts.metrics }}
|
||||
protocol: TCP
|
||||
resources:
|
||||
{{- toYaml .Values.redis.metrics.resources | nindent 10 }}
|
||||
{{- toYaml .Values.redis.exporter.resources | nindent 10 }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.redis.metrics.containerSecurityContext | nindent 10 }}
|
||||
{{- toYaml .Values.redis.exporter.containerSecurityContext | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- with .Values.redis.extraContainers }}
|
||||
{{- tpl (toYaml .) $ | nindent 6 }}
|
||||
|
|
|
|||
|
|
@ -991,6 +991,42 @@ redis:
|
|||
# -- Redis imagePullPolicy
|
||||
imagePullPolicy: IfNotPresent
|
||||
|
||||
# Prometheus redis-exporter sidecar
|
||||
exporter:
|
||||
# -- Enable Prometheus redis-exporter sidecar
|
||||
enabled: true
|
||||
|
||||
# Prometheus redis-exporter image
|
||||
image:
|
||||
# -- redis-exporter image repository
|
||||
repository: public.ecr.aws/bitnami/redis-exporter
|
||||
# -- redis-exporter image tag
|
||||
tag: 1.26.0-debian-10-r2
|
||||
# -- Image pull policy for the Redis exporter
|
||||
# @default -- `""` (defaults to global.image.imagePullPolicy)
|
||||
imagePullPolicy: ""
|
||||
|
||||
# -- Redis exporter security context
|
||||
# @default -- See [values.yaml]
|
||||
containerSecurityContext:
|
||||
runAsNonRoot: true
|
||||
readOnlyRootFilesystem: true
|
||||
allowPrivilegeEscalation: false
|
||||
seccompProfile:
|
||||
type: RuntimeDefault
|
||||
capabilities:
|
||||
drop:
|
||||
- ALL
|
||||
|
||||
# -- Resource limits and requests for redis-exporter sidecar
|
||||
resources: {}
|
||||
# limits:
|
||||
# cpu: 50m
|
||||
# memory: 64Mi
|
||||
# requests:
|
||||
# cpu: 10m
|
||||
# memory: 32Mi
|
||||
|
||||
# -- Secrets with credentials to pull images from a private registry
|
||||
# @default -- `[]` (defaults to global.imagePullSecrets)
|
||||
imagePullSecrets: []
|
||||
|
|
@ -1106,36 +1142,10 @@ redis:
|
|||
labels: {}
|
||||
|
||||
metrics:
|
||||
# -- Deploy metrics service and redis-exporter sidecar
|
||||
# -- Deploy metrics service
|
||||
enabled: false
|
||||
image:
|
||||
# -- redis-exporter image repository
|
||||
repository: public.ecr.aws/bitnami/redis-exporter
|
||||
# -- redis-exporter image tag
|
||||
tag: 1.26.0-debian-10-r2
|
||||
# -- redis-exporter image PullPolicy
|
||||
imagePullPolicy: IfNotPresent
|
||||
|
||||
# -- Redis exporter security context
|
||||
# @default -- See [values.yaml]
|
||||
containerSecurityContext:
|
||||
runAsNonRoot: true
|
||||
readOnlyRootFilesystem: true
|
||||
allowPrivilegeEscalation: false
|
||||
seccompProfile:
|
||||
type: RuntimeDefault
|
||||
capabilities:
|
||||
drop:
|
||||
- ALL
|
||||
|
||||
# -- Resource limits and requests for redis-exporter sidecar
|
||||
resources: {}
|
||||
# limits:
|
||||
# cpu: 50m
|
||||
# memory: 64Mi
|
||||
# requests:
|
||||
# cpu: 10m
|
||||
# memory: 32Mi
|
||||
# Redis metrics service configuration
|
||||
service:
|
||||
# -- Metrics service type
|
||||
type: ClusterIP
|
||||
|
|
@ -1149,6 +1159,7 @@ redis:
|
|||
servicePort: 9121
|
||||
# -- Metrics service port name
|
||||
portName: http-metrics
|
||||
|
||||
serviceMonitor:
|
||||
# -- Enable a prometheus ServiceMonitor
|
||||
enabled: false
|
||||
|
|
|
|||
Loading…
Reference in a new issue