Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[keys] redis and tasker fix #563

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions charts/keys/templates/redis/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ spec:
- configMap:
name: {{ include "keys.redis.name" . }}
name: conf
- name: data
emptyDir:
sizeLimit: 1Gi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а мы можем оценить? нам действительно столько надо?

containers:
- name: redis
image: {{ required "A valid .Values.dgctlDockerRegistry entry required" .Values.dgctlDockerRegistry }}/{{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
Expand All @@ -53,6 +56,8 @@ spec:
- name: conf
mountPath: {{ .Values.redis.configPath }}
subPath: redis.conf
- name: data
mountPath: /data
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а где в конфиге редис указано что ему нужен /data ?

{{- with .Values.redis.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
12 changes: 11 additions & 1 deletion charts/keys/templates/tasker/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,18 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with include "keys.psql.initTLS" . }}
initContainers:
- name: wait-redis
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

давайте без initContainer. Пусть ретраи работают.

image: redis
command: ['/bin/bash', '-c', "state=0; while (( $state == 0 )); do if redis-cli -u redis://default:{{ .Values.redis.password }}@{{ include "keys.redis.name" . }}:{{ .Values.redis.port }} -r 1 -i 1 info; then export state=1; else sleep 3; fi; done"]
resources:
limits:
cpu: 200m
memory: 384Mi
requests:
cpu: 50m
memory: 256Mi
{{- with include "keys.psql.initTLS" . }}
{{- . | nindent 8 }}
{{- end }}
containers:
Expand Down
Loading