From 600e617bc0f9bda01aa8b3ccfe649f8ea253b42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Juan=20G=C3=B3mez=20Pe=C3=B1alver?= Date: Wed, 18 Mar 2020 22:28:57 +0000 Subject: [PATCH] fix: Redis HA upgraded since 4.3.4 contains a bug on the chart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Juan Gómez Peñalver --- charts/argo-cd/charts/redis-ha-4.3.4.tgz | Bin 16935 -> 0 bytes charts/argo-cd/charts/redis-ha/Chart.yaml | 2 +- charts/argo-cd/charts/redis-ha/README.md | 6 +++++- .../templates/redis-ha-statefulset.yaml | 6 +++++- .../templates/redis-haproxy-deployment.yaml | 9 +++++++-- .../redis-haproxy-servicemonitor.yaml | 2 +- .../tests/test-redis-ha-configmap.yaml | 5 ++++- .../templates/tests/test-redis-ha-pod.yaml | 3 +++ charts/argo-cd/charts/redis-ha/values.yaml | 18 ++++++++++++++++++ charts/argo-cd/requirements.lock | 6 +++--- charts/argo-cd/requirements.yaml | 2 +- 11 files changed, 48 insertions(+), 11 deletions(-) delete mode 100644 charts/argo-cd/charts/redis-ha-4.3.4.tgz diff --git a/charts/argo-cd/charts/redis-ha-4.3.4.tgz b/charts/argo-cd/charts/redis-ha-4.3.4.tgz deleted file mode 100644 index 2ada79ee515a99d2937cbf756f741e4933585ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16935 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 diff --git a/charts/argo-cd/charts/redis-ha/Chart.yaml b/charts/argo-cd/charts/redis-ha/Chart.yaml index c71a67c5..04a04fdf 100644 --- a/charts/argo-cd/charts/redis-ha/Chart.yaml +++ b/charts/argo-cd/charts/redis-ha/Chart.yaml @@ -18,4 +18,4 @@ sources: - https://redis.io/download - https://github.com/scality/Zenko/tree/development/1.0/kubernetes/zenko/charts/redis-ha - https://github.com/oliver006/redis_exporter -version: 4.3.4 +version: 4.4.2 diff --git a/charts/argo-cd/charts/redis-ha/README.md b/charts/argo-cd/charts/redis-ha/README.md index 04b06c94..ba93ce0f 100644 --- a/charts/argo-cd/charts/redis-ha/README.md +++ b/charts/argo-cd/charts/redis-ha/README.md @@ -58,6 +58,7 @@ The following table lists the configurable parameters of the Redis chart and the | Parameter | Description | Default | |:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| | `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` | | `replicas` | Number of redis master/slave pods | `3` | | `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. | `""` | | `persistentVolume.size` | Size for the volume | 10Gi | | `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.image` | Exporter image | `oliver006/redis_exporter` | | `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.tag` | HAProxy Image Tag | `2.0.1` | | `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.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.resources` | HAProxy resources | `{}` | +| `haproxy.emptyDir` | Configuration of `emptyDir` | `{}` | | `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.annotations` | HAProxy service annotations | `{}` | diff --git a/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml b/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml index 32638cfd..65550968 100644 --- a/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml +++ b/charts/argo-cd/charts/redis-ha/templates/redis-ha-statefulset.yaml @@ -84,6 +84,9 @@ spec: {{ template "redis-ha.fullname" . }}: replica topologyKey: failure-domain.beta.kubernetes.io/zone {{- end }} + {{- if .Values.imagePullSecrets }} + imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }} + {{- end }} securityContext: {{ toYaml .Values.securityContext | indent 8 }} serviceAccountName: {{ template "redis-ha.serviceAccountName" . }} @@ -311,5 +314,6 @@ spec: path: {{ tpl .Values.hostPath.path .}} {{- else }} - name: data - emptyDir: {} + emptyDir: +{{ toYaml .Values.emptyDir | indent 10 }} {{- end }} diff --git a/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-deployment.yaml b/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-deployment.yaml index d116691e..6348e186 100644 --- a/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-deployment.yaml +++ b/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-deployment.yaml @@ -102,6 +102,9 @@ spec: readOnly: true - name: data mountPath: /data + {{- if .Values.haproxy.imagePullSecrets }} + imagePullSecrets: {{ toYaml .Values.haproxy.imagePullSecrets | nindent 8 }} + {{- end }} securityContext: {{ toYaml .Values.haproxy.securityContext | indent 8 }} containers: @@ -140,7 +143,9 @@ spec: configMap: name: {{ template "redis-ha.fullname" . }}-configmap - name: shared-socket - emptyDir: {} + emptyDir: +{{ toYaml .Values.haproxy.emptyDir | indent 10 }} - name: data - emptyDir: {} + emptyDir: +{{ toYaml .Values.haproxy.emptyDir | indent 10 }} {{- end }} diff --git a/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml b/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml index 965bc976..b7589702 100644 --- a/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml +++ b/charts/argo-cd/charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml @@ -30,5 +30,5 @@ spec: matchLabels: app: {{ template "redis-ha.name" . }} release: {{ .Release.Name }} - component: {{ template "redis-ha.name" . }}-haproxy + component: {{ template "redis-ha.fullname" . }}-haproxy {{- end }} diff --git a/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-configmap.yaml b/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-configmap.yaml index e782af94..837d1fb2 100644 --- a/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-configmap.yaml +++ b/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-configmap.yaml @@ -17,8 +17,11 @@ spec: - name: config mountPath: /readonly-config readOnly: true + {{- if .Values.imagePullSecrets }} + imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 4 }} + {{- end }} + restartPolicy: Never volumes: - name: config configMap: name: {{ template "redis-ha.fullname" . }}-configmap - restartPolicy: Never diff --git a/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-pod.yaml b/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-pod.yaml index d22058bd..588a7d2b 100644 --- a/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-pod.yaml +++ b/charts/argo-cd/charts/redis-ha/templates/tests/test-redis-ha-pod.yaml @@ -14,4 +14,7 @@ spec: - sh - -c - 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 diff --git a/charts/argo-cd/charts/redis-ha/values.yaml b/charts/argo-cd/charts/redis-ha/values.yaml index 1672d52a..aca78f13 100644 --- a/charts/argo-cd/charts/redis-ha/values.yaml +++ b/charts/argo-cd/charts/redis-ha/values.yaml @@ -5,6 +5,14 @@ image: repository: redis tag: 5.0.6-alpine 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: 3 @@ -38,8 +46,16 @@ haproxy: repository: haproxy tag: 2.0.4 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: {} resources: {} + emptyDir: {} ## Enable sticky sessions to Redis nodes via HAProxy ## Very useful for long-living connections as in case of Sentry for example stickyBalancing: false @@ -342,3 +358,5 @@ hostPath: # change the owner of the hostPath folder to the user defined in the # security context chown: true + +emptyDir: {} diff --git a/charts/argo-cd/requirements.lock b/charts/argo-cd/requirements.lock index 17f99d57..c6a4b7cc 100644 --- a/charts/argo-cd/requirements.lock +++ b/charts/argo-cd/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: redis-ha repository: https://kubernetes-charts.storage.googleapis.com - version: 4.3.4 -digest: sha256:281b2ee97e4ae47d8248912db4207bbb19f098de8de037452f7b50ebcc2819d4 -generated: "2020-03-18T20:14:33.015349017Z" + version: 4.4.2 +digest: sha256:d3b7b8ec4c09eeeae44a64352f983cd1619cf98d80d0e49780a016aedb477a6c +generated: "2020-03-18T22:24:39.082009894Z" diff --git a/charts/argo-cd/requirements.yaml b/charts/argo-cd/requirements.yaml index 4ef0adaf..48c808aa 100644 --- a/charts/argo-cd/requirements.yaml +++ b/charts/argo-cd/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: redis-ha alias: redis.ha - version: 4.3.4 + version: 4.4.2 repository: https://kubernetes-charts.storage.googleapis.com condition: redis.ha.enabled \ No newline at end of file