DevFW-CICD/argocd-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Redis HA upgraded since 4.3.4 contains a bug on the chart

Browse source 
Signed-off-by: Carlos Juan Gómez Peñalver <carlosjuangp@gmail.com>
This commit is contained in:
Carlos Juan Gómez Peñalver 2020-03-18 22:28:57 +00:00
parent d3d339563b
commit 600e617bc0
11 changed files with 48 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
charts/argo-cd/charts/redis-ha-4.3.4.tgz
View file

Binary file not shown.

2
charts/argo-cd/charts/redis-ha/Chart.yaml
View file

@ -18,4 +18,4 @@ sources:
- https://redis.io/download - https://redis.io/download
- https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha - https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha
- https://github.com/oliver006/redis_exporter - https://github.com/oliver006/redis_exporter
version: 4.3.4 version: 4.4.2

6
charts/argo-cd/charts/redis-ha/README.md
View file

@ -58,6 +58,7 @@ The following table lists the configurable parameters of the Redis chart and the
| Parameter | Description | Default | | Parameter | Description | Default |
|:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| |:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------|
| `image` | Redis image | `redis` | | `image` | Redis image | `redis` |
| `imagePullSecrets` | Reference to one or more secrets to be used when pulling redis images | [] |
| `tag` | Redis tag | `5.0.6-alpine` | | `tag` | Redis tag | `5.0.6-alpine` |
| `replicas` | Number of redis master/slave pods | `3` | | `replicas` | Number of redis master/slave pods | `3` |
| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | | `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
@ -86,7 +87,8 @@ The following table lists the configurable parameters of the Redis chart and the
| `affinity` | Override all other affinity settings with a string. | `""` | | `affinity` | Override all other affinity settings with a string. | `""` |
| `persistentVolume.size` | Size for the volume | 10Gi | | `persistentVolume.size` | Size for the volume | 10Gi |
| `persistentVolume.annotations` | Annotations for the volume | `{}` | | `persistentVolume.annotations` | Annotations for the volume | `{}` |
| `persistentVolume.reclaimPolicy` | Method used to reclaim an obsoleted volume. `Delete` or `Retain` | `""` | | `persistentVolume.reclaimPolicy` | Method used to reclaim an obsoleted volume. `Delete` or `Retain` | `""` |
| `emptyDir` | Configuration of `emptyDir`, used only if persistentVolume is disabled and no hostPath specified | `{}` |
| `exporter.enabled` | If `true`, the prometheus exporter sidecar is enabled | `false` | | `exporter.enabled` | If `true`, the prometheus exporter sidecar is enabled | `false` |
| `exporter.image` | Exporter image | `oliver006/redis_exporter` | | `exporter.image` | Exporter image | `oliver006/redis_exporter` |
| `exporter.tag` | Exporter tag | `v0.31.0` | | `exporter.tag` | Exporter tag | `v0.31.0` |
@ -105,10 +107,12 @@ The following table lists the configurable parameters of the Redis chart and the
| `haproxy.image.repository`| HAProxy Image Repository | `haproxy` | | `haproxy.image.repository`| HAProxy Image Repository | `haproxy` |
| `haproxy.image.tag` | HAProxy Image Tag | `2.0.1` | | `haproxy.image.tag` | HAProxy Image Tag | `2.0.1` |
| `haproxy.image.pullPolicy`| HAProxy Image PullPolicy | `IfNotPresent` | | `haproxy.image.pullPolicy`| HAProxy Image PullPolicy | `IfNotPresent` |
| `haproxy.imagePullSecrets`| Reference to one or more secrets to be used when pulling haproxy images | [] |
| `haproxy.annotations` | HAProxy template annotations | `{}` | | `haproxy.annotations` | HAProxy template annotations | `{}` |
| `haproxy.customConfig` | Allows for custom config-haproxy.cfg file to be applied. If this is used then default config will be overwriten | `` | | `haproxy.customConfig` | Allows for custom config-haproxy.cfg file to be applied. If this is used then default config will be overwriten | `` |
| `haproxy.extraConfig` | Allows to place any additional configuration section to add to the default config-haproxy.cfg | `` | | `haproxy.extraConfig` | Allows to place any additional configuration section to add to the default config-haproxy.cfg | `` |
| `haproxy.resources` | HAProxy resources | `{}` | | `haproxy.resources` | HAProxy resources | `{}` |
| `haproxy.emptyDir` | Configuration of `emptyDir` | `{}` |
| `haproxy.service.type` | HAProxy service type "ClusterIP", "LoadBalancer" or "NodePort" | `ClusterIP` | | `haproxy.service.type` | HAProxy service type "ClusterIP", "LoadBalancer" or "NodePort" | `ClusterIP` |
| `haproxy.service.nodePort` | HAProxy service nodePort value (haproxy.service.type must be NodePort) | not set | | `haproxy.service.nodePort` | HAProxy service nodePort value (haproxy.service.type must be NodePort) | not set |
| `haproxy.service.annotations` | HAProxy service annotations | `{}` | | `haproxy.service.annotations` | HAProxy service annotations | `{}` |

6
charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml
View file

@ -84,6 +84,9 @@ spec:
{{ template "redis-ha.fullname" . }}: replica {{ template "redis-ha.fullname" . }}: replica
topologyKey: failure-domain.beta.kubernetes.io/zone topologyKey: failure-domain.beta.kubernetes.io/zone
{{- end }} {{- end }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }}
{{- end }}
securityContext: securityContext:
{{ toYaml .Values.securityContext | indent 8 }} {{ toYaml .Values.securityContext | indent 8 }}
serviceAccountName: {{ template "redis-ha.serviceAccountName" . }} serviceAccountName: {{ template "redis-ha.serviceAccountName" . }}
@ -311,5 +314,6 @@ spec:
path: {{ tpl .Values.hostPath.path .}} path: {{ tpl .Values.hostPath.path .}}
{{- else }} {{- else }}
- name: data - name: data
emptyDir: {} emptyDir:
{{ toYaml .Values.emptyDir | indent 10 }}
{{- end }} {{- end }}

9
charts/argo-cd/charts/redis-ha/templates/redis-haproxy-deployment.yaml
View file

@ -102,6 +102,9 @@ spec:
readOnly: true readOnly: true
- name: data - name: data
mountPath: /data mountPath: /data
{{- if .Values.haproxy.imagePullSecrets }}
imagePullSecrets: {{ toYaml .Values.haproxy.imagePullSecrets | nindent 8 }}
{{- end }}
securityContext: securityContext:
{{ toYaml .Values.haproxy.securityContext | indent 8 }} {{ toYaml .Values.haproxy.securityContext | indent 8 }}
containers: containers:
@ -140,7 +143,9 @@ spec:
configMap: configMap:
name: {{ template "redis-ha.fullname" . }}-configmap name: {{ template "redis-ha.fullname" . }}-configmap
- name: shared-socket - name: shared-socket
emptyDir: {} emptyDir:
{{ toYaml .Values.haproxy.emptyDir | indent 10 }}
- name: data - name: data
emptyDir: {} emptyDir:
{{ toYaml .Values.haproxy.emptyDir | indent 10 }}
{{- end }} {{- end }}

2
charts/argo-cd/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml
View file

@ -30,5 +30,5 @@ spec:
matchLabels: matchLabels:
app: {{ template "redis-ha.name" . }} app: {{ template "redis-ha.name" . }}
release: {{ .Release.Name }} release: {{ .Release.Name }}
component: {{ template "redis-ha.name" . }}-haproxy component: {{ template "redis-ha.fullname" . }}-haproxy
{{- end }} {{- end }}

5
charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-configmap.yaml
View file

@ -17,8 +17,11 @@ spec:
- name: config - name: config
mountPath: /readonly-config mountPath: /readonly-config
readOnly: true readOnly: true
{{- if .Values.imagePullSecrets }}
imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 4 }}
{{- end }}
restartPolicy: Never
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: {{ template "redis-ha.fullname" . }}-configmap name: {{ template "redis-ha.fullname" . }}-configmap
restartPolicy: Never

3
charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-pod.yaml
View file

@ -14,4 +14,7 @@ spec:
- sh - sh
- -c - -c
- redis-cli -h {{ template "redis-ha.fullname" . }} -p {{ .Values.redis.port }} info server - redis-cli -h {{ template "redis-ha.fullname" . }} -p {{ .Values.redis.port }} info server
{{- if .Values.imagePullSecrets }}
imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 4 }}
{{- end }}
restartPolicy: Never restartPolicy: Never

18
charts/argo-cd/charts/redis-ha/values.yaml
View file

@ -5,6 +5,14 @@ image:
repository: redis repository: redis
tag: 5.0.6-alpine tag: 5.0.6-alpine
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Reference to one or more secrets to be used when pulling images
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
## This imagePullSecrets is only for redis images
##
imagePullSecrets: []
# - name: "image-pull-secret"
## replicas number for each component ## replicas number for each component
replicas: 3 replicas: 3
@ -38,8 +46,16 @@ haproxy:
repository: haproxy repository: haproxy
tag: 2.0.4 tag: 2.0.4
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Reference to one or more secrets to be used when pulling images
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
##
imagePullSecrets: []
# - name: "image-pull-secret"
annotations: {} annotations: {}
resources: {} resources: {}
emptyDir: {}
## Enable sticky sessions to Redis nodes via HAProxy ## Enable sticky sessions to Redis nodes via HAProxy
## Very useful for long-living connections as in case of Sentry for example ## Very useful for long-living connections as in case of Sentry for example
stickyBalancing: false stickyBalancing: false
@ -342,3 +358,5 @@ hostPath:
# change the owner of the hostPath folder to the user defined in the # change the owner of the hostPath folder to the user defined in the
# security context # security context
chown: true chown: true
emptyDir: {}

6
charts/argo-cd/requirements.lock
View file

@ -1,6 +1,6 @@
dependencies: dependencies:
- name: redis-ha - name: redis-ha
repository: https://kubernetes-charts.storage.googleapis.com repository: https://kubernetes-charts.storage.googleapis.com
version: 4.3.4 version: 4.4.2
digest: sha256:281b2ee97e4ae47d8248912db4207bbb19f098de8de037452f7b50ebcc2819d4 digest: sha256:d3b7b8ec4c09eeeae44a64352f983cd1619cf98d80d0e49780a016aedb477a6c
generated: "2020-03-18T20:14:33.015349017Z" generated: "2020-03-18T22:24:39.082009894Z"

2
charts/argo-cd/requirements.yaml
View file

@ -1,6 +1,6 @@
dependencies: dependencies:
- name: redis-ha - name: redis-ha
alias: redis.ha alias: redis.ha
version: 4.3.4 version: 4.4.2
repository: https://kubernetes-charts.storage.googleapis.com repository: https://kubernetes-charts.storage.googleapis.com
condition: redis.ha.enabled condition: redis.ha.enabled