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 2ada79ee..00000000 Binary files a/charts/argo-cd/charts/redis-ha-4.3.4.tgz and /dev/null differ 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