Skip to content

Commit

Permalink
fix: chart render error when enable initcontainer (#1146)
Browse files Browse the repository at this point in the history
fix: update initContainer and sidecar property references

- Updated version and appVersion for redis, redis-cluster, redis-replication, and redis-sentinel charts.
- Modified initContainer and sidecar property references in templates to include the current context.

This update ensures consistency across the Redis charts and improves template rendering.

Signed-off-by: drivebyer <[email protected]>
  • Loading branch information
drivebyer authored Dec 2, 2024
1 parent 53b95a0 commit b9034e8
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions charts/redis-cluster/Chart.yaml
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.16.2
appVersion: "0.16.2"
version: 0.16.3
appVersion: "0.16.3"
home: https://github.com/ot-container-kit/redis-operator
sources:
- https://github.com/ot-container-kit/redis-operator
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-cluster/templates/redis-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ spec:
secretName: {{ .Values.acl.secret.secretName | quote }}
{{- end }}
{{- if and .Values.sidecars (ne .Values.sidecars.name "") (ne .Values.sidecars.image "") }}
sidecars: {{ include "sidecar.properties" | nindent 4 }}
sidecars: {{ include "sidecar.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.initContainer .Values.initContainer.enabled (ne .Values.initContainer.image "") }}
initContainer: {{ include "initContainer.properties" | nindent 4 }}
initContainer: {{ include "initContainer.properties" . | nindent 4 }}
{{- end }}
{{- if .Values.env }}
env: {{ toYaml .Values.env | nindent 4 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-replication/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: redis-replication
description: Provides easy redis setup definitions for Kubernetes services, and deployment.
version: 0.16.4
appVersion: "0.16.4"
version: 0.16.5
appVersion: "0.16.5"
type: application
engine: gotpl
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-replication/templates/redis-replication.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ spec:
secretName: {{ .Values.acl.secret.secretName | quote }}
{{- end }}
{{- if and .Values.initContainer .Values.initContainer.enabled (ne .Values.initContainer.image "") }}
initContainer: {{ include "initContainer.properties" | nindent 4 }}
initContainer: {{ include "initContainer.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.sidecars (ne .Values.sidecars.name "") (ne .Values.sidecars.image "") }}
sidecars: {{ include "sidecar.properties" | nindent 4 }}
sidecars: {{ include "sidecar.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.serviceAccountName (ne .Values.serviceAccountName "") }}
serviceAccountName: "{{ .Values.serviceAccountName }}"
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-sentinel/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: redis-sentinel
description: Provides easy redis setup definitions for Kubernetes services, and deployment.
version: 0.16.6
appVersion: "0.16.6"
version: 0.16.7
appVersion: "0.16.7"
home: https://github.com/ot-container-kit/redis-operator
sources:
- https://github.com/ot-container-kit/redis-operator
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-sentinel/templates/redis-sentinel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ spec:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if and .Values.initContainer .Values.initContainer.enabled (ne .Values.initContainer.image "") }}
initContainer: {{ include "initContainer.properties" | nindent 4 }}
initContainer: {{ include "initContainer.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.sidecars (ne .Values.sidecars.name "") (ne .Values.sidecars.image "") }}
sidecars: {{ include "sidecar.properties" | nindent 4 }}
sidecars: {{ include "sidecar.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.serviceAccountName (ne .Values.serviceAccountName "") }}
serviceAccountName: "{{ .Values.serviceAccountName }}"
Expand Down
4 changes: 2 additions & 2 deletions charts/redis/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
apiVersion: v2
name: redis
description: Provides easy redis setup definitions for Kubernetes services, and deployment.
version: 0.16.2
appVersion: "0.16.2"
version: 0.16.3
appVersion: "0.16.3"
home: https://github.com/ot-container-kit/redis-operator
sources:
- https://github.com/ot-container-kit/redis-operator
Expand Down
4 changes: 2 additions & 2 deletions charts/redis/templates/redis-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ spec:
secretName: {{ .Values.acl.secret.secretName | quote }}
{{- end }}
{{- if and .Values.initContainer .Values.initContainer.enabled (ne .Values.initContainer.image "") }}
initContainer: {{ include "initContainer.properties" | nindent 4 }}
initContainer: {{ include "initContainer.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.sidecars (ne .Values.sidecars.name "") (ne .Values.sidecars.image "") }}
sidecars: {{ include "sidecar.properties" | nindent 4 }}
sidecars: {{ include "sidecar.properties" . | nindent 4 }}
{{- end }}
{{- if and .Values.serviceAccountName (ne .Values.serviceAccountName "") }}
serviceAccountName: "{{ .Values.serviceAccountName }}"
Expand Down

0 comments on commit b9034e8

Please sign in to comment.