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.

Sign up for GitHub

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

Jump to bottom

[Release] : Chart v0.15.1 #140

Closed
wants to merge 7 commits into from
Closed

[Release] : Chart v0.15.1 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f955a75
fix operator chart
shubham-cmyk Sep 23, 2023
c953c67
release v0.15.1 charts
shubham-cmyk Sep 24, 2023
10ae1f6
add helpers.tpl
shubham-cmyk Sep 27, 2023
f6731fd
remove
shubham-cmyk Sep 27, 2023
7e8419d
remove annotation
shubham-cmyk Sep 28, 2023
827660c
fix termination
shubham-cmyk Sep 28, 2023
ec85a40
fix intendation
shubham-cmyk Sep 28, 2023
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
4 changes: 2 additions & 2 deletions charts/redis-cluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: redis-cluster
description: Provides easy redis setup definitions for Kubernetes services, and deployment.
version: 0.15.3
appVersion: "0.15.0"
version: 0.15.5
appVersion: "0.15.1"
home: https://github.com/ot-container-kit/redis-operator
sources:
- https://github.com/ot-container-kit/redis-operator
Expand Down
198 changes: 164 additions & 34 deletions charts/redis-cluster/README.md
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion charts/redis-cluster/templates/extra-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if eq .Values.externalConfig.enabled true }}
---

apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -11,6 +11,7 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
app.kubernetes.io/component: middleware
app.kubernetes.io/part-of : {{ .Release.Name }}
data:
redis-additional.conf: |
{{ .Values.externalConfig.data | nindent 4 }}
Expand Down
192 changes: 157 additions & 35 deletions charts/redis-cluster/templates/redis-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,25 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
app.kubernetes.io/component: middleware
app.kubernetes.io/part-of: {{ .Release.Name }}
{{- if .Values.labels }}
{{- range $labelkey, $labelvalue := .Values.labels }}
{{ $labelkey}}: {{ $labelvalue }}
{{- end }}
{{- end }}
{{- with .Values.annotations }}
annotations:
{{- toYaml . | nindent 6 }}
{{- end }}
spec:
clusterSize: {{ .Values.redisCluster.clusterSize }}
persistenceEnabled: {{ .Values.redisCluster.persistenceEnabled }}
clusterVersion: {{ .Values.redisCluster.clusterVersion }}
redisLeader:
{{- if .Values.redisCluster.leader.affinity }}
affinity:
{{ toYaml .Values.redisCluster.leader.affinity | nindent 6 }}
{{- end }}
replicas: {{ .Values.redisCluster.leader.replicas }}
{{- if eq .Values.externalConfig.enabled true }}
redisConfig:
additionalRedisConfig: {{ .Release.Name }}-ext-config
additionalRedisConfig: "{{ .Release.Name }}"-ext-config
{{- end }}
{{- if .Values.redisCluster.leader.affinity }}
affinity:
{{ toYaml .Values.redisCluster.leader.affinity | nindent 6 }}
{{- end }}
{{- if eq .Values.pdb.enabled true }}
pdb:
Expand All @@ -43,16 +40,55 @@ spec:
minAvailable: {{ .Values.pdb.minAvailable }}
{{- end }}
{{- end }}
redisFollower:
{{- if .Values.redisCluster.follower.affinity }}
affinity:
{{ toYaml .Values.redisCluster.follower.affinity | nindent 6 }}
{{- if eq .Values.readinessProbe.enabled true }}
readinessProbe:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
{{- end }}
{{- if eq .Values.livenessProbe.enabled true }}
livenessProbe:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
successThreshold: {{ .Values.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
{{- end }}
{{- if .Values.redisCluster.leader.tolerations }}
tolerations:
{{- range .Values.redisCluster.leader.tolerations }}
- key: {{ .key | quote }}
operator: {{ .operator | quote }}
value: {{ .value | quote }}
effect: {{ .effect | quote }}
{{- end }}
{{- end }}
{{- if .Values.redisCluster.leader.nodeSelector }}
nodeSelector:
{{- range $key, $value := .Values.redisCluster.leader.nodeSelector }}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
{{- end }}
{{- if .Values.redisCluster.leader.securityContext }}
{{- if ne (len .Values.redisCluster.leader.securityContext) 0 }}
securityContext: {{- toYaml .Values.redisCluster.leader.securityContext | nindent 2 }}
{{- end }}
{{- end }}
{{- if ne (int .Values.redisCluster.leader.terminationGracePeriodSeconds) 0 }}
terminationGracePeriodSeconds: {{ .Values.redisCluster.leader.terminationGracePeriodSeconds }}
{{- end }}
redisFollower:
replicas: {{ .Values.redisCluster.follower.replicas }}
{{- if eq .Values.externalConfig.enabled true }}
redisConfig:
additionalRedisConfig: {{ .Release.Name }}-ext-config
{{- end }}
{{- if .Values.redisCluster.follower.affinity }}
affinity:
{{ toYaml .Values.redisCluster.follower.affinity | nindent 6 }}
{{- end }}
{{- if eq .Values.pdb.enabled true }}
pdb:
enabled: {{ .Values.pdb.enabled }}
Expand All @@ -62,50 +98,136 @@ spec:
{{- if .Values.pdb.minAvailable }}
minAvailable: {{ .Values.pdb.minAvailable }}
{{- end }}
{{- end }}
{{- if eq .Values.readinessProbe.enabled true }}
readinessProbe:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
{{- end }}
{{- if eq .Values.livenessProbe.enabled true }}
livenessProbe:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
successThreshold: {{ .Values.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
{{- end }}
{{- if .Values.redisCluster.follower.tolerations }}
tolerations:
{{- range .Values.redisCluster.follower.tolerations }}
- key: {{ .key | quote }}
operator: {{ .operator | quote }}
value: {{ .value | quote }}
effect: {{ .effect | quote }}
{{- end }}
{{- end }}
{{- if .Values.redisCluster.follower.nodeSelector }}
nodeSelector:
{{- range $key, $value := .Values.redisCluster.follower.nodeSelector }}
{{ $key | quote }}: {{ $value | quote }}
{{- end }}
{{- end }}
{{- if .Values.redisCluster.follower.securityContext }}
{{- if ne (len .Values.redisCluster.follower.securityContext) 0 }}
securityContext: {{- toYaml .Values.redisCluster.follower.securityContext | nindent 2 }}
{{- end }}
{{- end }}
{{- if ne (int .Values.redisCluster.follower.terminationGracePeriodSeconds) 0 }}
terminationGracePeriodSeconds: {{ .Values.redisCluster.follower.terminationGracePeriodSeconds }}
{{- end }}
redisExporter:
enabled: {{ .Values.redisExporter.enabled }}
image: "{{ .Values.redisExporter.image }}:{{ .Values.redisExporter.tag }}"
image: "{{ .Values.redisExporter.image }}"
imagePullPolicy: "{{ .Values.redisExporter.imagePullPolicy }}"
resources:
{{ toYaml .Values.redisExporter.resources | indent 6 }}
{{- with .Values.redisExporter.env }}
env:
{{ toYaml . | indent 6 }}
{{- end }}
kubernetesConfig:
image: "{{ .Values.redisCluster.image }}:{{ .Values.redisCluster.tag }}"
imagePullPolicy: "{{ .Values.redisCluster.imagePullPolicy }}"
resources:
{{ toYaml .Values.redisCluster.resources | indent 6 }}
{{- if .Values.redisCluster.redisSecret }}
{{- with .Values.redisCluster.redisSecret }}
{{- if and .secretName .secretKey }}
redisSecret:
name: "{{ .Values.redisCluster.redisSecret.secretName }}"
key: "{{ .Values.redisCluster.redisSecret.secretKey }}"
{{- end }}
{{- if .Values.storageSpec }}
storage:
{{ toYaml .Values.storageSpec | indent 4 }}
name: "{{ .secretName | trim }}"
key: "{{ .secretKey | trim }}"
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 4 }}
{{- end }}
{{- with .Values.storageSpec }}
storage:
{{- if .volumeClaimTemplate }}
volumeClaimTemplate:
{{ toYaml .volumeClaimTemplate | indent 4 }}
{{- end }}
{{- if .volumeMount }}
volumeMount:
{{ toYaml .volumeMount | indent 4 }}
{{- end }}
{{- if .nodeConfVolume }}
nodeConfVolume: {{ .nodeConfVolume }}
{{- end }}
{{- if .nodeConfVolumeClaimTemplate }}
nodeConfVolumeClaimTemplate:
{{ toYaml .nodeConfVolumeClaimTemplate | indent 4 }}
{{- end }}
{{- end }}
{{- if .Values.podSecurityContext }}
podSecurityContext:
{{ toYaml .Values.podSecurityContext | indent 4 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 4 }}
{{- if and .Values.priorityClassName (ne .Values.priorityClassName "") }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
{{- if .Values.TLS }}
{{- if and .Values.TLS.enabled .Values.TLS.ca .Values.TLS.cert .Values.TLS.key .Values.TLS.secret.secretName }}
TLS:
{{ toYaml .Values.TLS | indent 4 }}
{{- end}}
ca: {{ .Values.TLS.ca | quote }}
cert: {{ .Values.TLS.cert | quote }}
key: {{ .Values.TLS.key | quote }}
secret:
secretName: {{ .Values.TLS.secret.secretName | quote }}
{{- end }}
{{- if and .Values.acl.enabled .Values.acl.secret }}
acl:
secret: {{ .Values.acl.secret | quote }}
{{- end }}
{{- with .Values.initContainer }}
{{- if .enabled }}
initContainer:
image: {{ .image | quote }}
imagePullPolicy: {{ .imagePullPolicy | default "IfNotPresent" }}
{{- with .resources }}
resources:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .env }}
env:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .command }}
command:
{{ toYaml . | indent 4 }}
{{- end }}
{{- with .args }}
args:
{{ toYaml . | indent 4 }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.sidecars }}
sidecars:
{{ toYaml .Values.sidecars | indent 4 }}
{{- end }}
{{- if .Values.serviceAccountName }}
serviceAccountName: "{{ .Values.serviceAccountName }}"
serviceAccountName: "{{ .Release.Name }}"
{{- if .Values.env }}
{{- if gt (len .Values.env) 0 }}
env:
{{ toYaml .Values.env | indent 2 }}
{{- end }}
{{- end }}
Loading
Loading