-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-releaser-2
- Loading branch information
Showing
20 changed files
with
6,455 additions
and
4,276 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3,328 changes: 1,994 additions & 1,334 deletions
3,328
charts/redis-operator/crds/redis-cluster.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
2,970 changes: 1,754 additions & 1,216 deletions
2,970
charts/redis-operator/crds/redis-replication.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| {{/* vim: set filetype=mustache: */}} | ||
|
|
||
| {{/* Define common labels */}} | ||
| {{- define "common.labels" -}} | ||
| app.kubernetes.io/name: {{ .Release.Name }} | ||
| helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/version: {{ .Chart.AppVersion }} | ||
| app.kubernetes.io/component: middleware | ||
| {{- if .Values.labels }} | ||
| {{- range $labelkey, $labelvalue := .Values.labels }} | ||
| {{ $labelkey}}: {{ $labelvalue }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end -}} | ||
|
|
||
| {{/* Generate init container properties */}} | ||
| {{- define "initContainer.properties" -}} | ||
| {{- with .Values.initContainer }} | ||
| {{- if .enabled }} | ||
| image: {{ .image }} | ||
| {{- if .imagePullPolicy }} | ||
| imagePullPolicy: {{ .imagePullPolicy }} | ||
| {{- end }} | ||
| {{- if .resources }} | ||
| resources: | ||
| {{ toYaml .resources | nindent 2 }} | ||
| {{- end }} | ||
| {{- if .env }} | ||
| env: | ||
| {{ toYaml .env | nindent 2 }} | ||
| {{- end }} | ||
| {{- if .command }} | ||
| command: | ||
| {{ toYaml .command | nindent 2 }} | ||
| {{- end }} | ||
| {{- if .args }} | ||
| args: | ||
| {{ toYaml .args | nindent 2 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end -}} | ||
|
|
||
| {{/* Generate sidecar properties */}} | ||
| {{- define "sidecar.properties" -}} | ||
| {{- with .Values.sidecars }} | ||
| name: {{ .name }} | ||
| image: {{ .image }} | ||
| {{- if .imagePullPolicy }} | ||
| imagePullPolicy: {{ .imagePullPolicy }} | ||
| {{- end }} | ||
| {{- if .resources }} | ||
| resources: | ||
| {{ toYaml .resources | nindent 2 }} | ||
| {{- end }} | ||
| {{- if .env }} | ||
| env: | ||
| {{ toYaml .env | nindent 2 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end -}} |
145 changes: 75 additions & 70 deletions
145
charts/redis-replication/templates/redis-replication.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,88 @@ | ||
| --- | ||
| apiVersion: redis.redis.opstreelabs.in/v1beta1 | ||
| apiVersion: redis.redis.opstreelabs.in/v1beta2 | ||
| kind: RedisReplication | ||
| metadata: | ||
| name: {{ .Release.Name }} | ||
| labels: | ||
| app.kubernetes.io/name: {{ .Release.Name }} | ||
| helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/version: {{ .Chart.AppVersion }} | ||
| app.kubernetes.io/component: middleware | ||
| {{- if .Values.labels }} | ||
| {{- range $labelkey, $labelvalue := .Values.labels }} | ||
| {{ $labelkey}}: {{ $labelvalue }} | ||
| {{- end }} | ||
| {{- end }} | ||
| labels: {{- include "common.labels" . | nindent 4 }} | ||
| spec: | ||
| clusterSize: {{ .Values.redisReplication.clusterSize }} | ||
| {{- if eq .Values.externalConfig.enabled true }} | ||
| redisConfig: | ||
| additionalRedisConfig: {{ .Release.Name }}-ext-config | ||
| {{- end }} | ||
| redisExporter: | ||
| enabled: {{ .Values.redisExporter.enabled }} | ||
| image: "{{ .Values.redisExporter.image }}:{{ .Values.redisExporter.tag }}" | ||
| imagePullPolicy: "{{ .Values.redisExporter.imagePullPolicy }}" | ||
| resources: | ||
| {{ toYaml .Values.redisExporter.resources | indent 6 }} | ||
| {{- if .Values.redisExporter.env }} | ||
| env: | ||
| {{ toYaml .Values.redisExporter.env | indent 4 }} | ||
| {{- end }} | ||
| kubernetesConfig: | ||
| image: "{{ .Values.redisReplication.image }}:{{ .Values.redisReplication.tag }}" | ||
| imagePullPolicy: "{{ .Values.redisReplication.imagePullPolicy }}" | ||
| resources: | ||
| {{ toYaml .Values.redisReplication.resources | indent 6 }} | ||
| {{- if .Values.redisReplication.redisSecret }} | ||
| {{- if .Values.redisReplication.imagePullSecrets }} | ||
| imagePullSecrets: {{ toYaml .Values.redisReplication.imagePullSecrets | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.redisReplication.resources}} | ||
| resources: {{ toYaml .Values.redisReplication.resources | nindent 6 }} | ||
| {{- end }} | ||
| {{- if and .Values.redisReplication.redisSecret.secretName .Values.redisReplication.redisSecret.secretKey }} | ||
| redisSecret: | ||
| name: "{{ .Values.redisReplication.redisSecret.secretName }}" | ||
| key: "{{ .Values.redisReplication.redisSecret.secretKey }}" | ||
| {{- end }} | ||
| {{- if .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- range $imageSecrets := .Values.imagePullSecrets }} | ||
| - name: {{ $imageSecrets.name }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if .Values.storageSpec }} | ||
| storage: | ||
| {{ toYaml .Values.storageSpec | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.priorityClassName }} | ||
| name: "{{ .Values.redisReplication.redisSecret.secretName | quote }}" | ||
| key: "{{ .Values.redisReplication.redisSecret.secretKey | quote }}" | ||
| {{- end }} | ||
| {{- if .Values.redisReplication.ignoreAnnotations}} | ||
| ignoreAnnotations: {{ toYaml .Values.redisReplication.ignoreAnnotations | nindent 6 }} | ||
| {{- end }} | ||
|
|
||
| redisExporter: | ||
| enabled: {{ .Values.redisExporter.enabled }} | ||
| image: "{{ .Values.redisExporter.image }}:{{ .Values.redisExporter.tag }}" | ||
| imagePullPolicy: "{{ .Values.redisExporter.imagePullPolicy }}" | ||
| {{- if .Values.redisExporter.resources}} | ||
| resources: {{ toYaml .Values.redisExporter.resources | nindent 6 }} | ||
| {{- end }} | ||
| {{- if .Values.redisExporter.env }} | ||
| env: {{ toYaml .Values.redisExporter.env | nindent 6 }} | ||
| {{- end }} | ||
|
|
||
| {{- if .Values.externalConfig.enabled }} | ||
| redisConfig: | ||
| additionalRedisConfig: "{{ .Release.Name }}-ext-config" | ||
| {{- end }} | ||
| {{- if .Values.storageSpec }} | ||
| storage: {{ toYaml .Values.storageSpec | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.nodeSelector }} | ||
| nodeSelector: {{ toYaml .Values.nodeSelector | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.podSecurityContext }} | ||
| podSecurityContext: {{ toYaml .Values.podSecurityContext | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.securityContext }} | ||
| securityContext: {{ toYaml .Values.securityContext | nindent 4 }} | ||
| {{- end }} | ||
| {{- if and .Values.priorityClassName (ne .Values.priorityClassName "") }} | ||
| priorityClassName: "{{ .Values.priorityClassName }}" | ||
| {{- end }} | ||
| {{- if .Values.nodeSelector }} | ||
| nodeSelector: | ||
| {{ toYaml .Values.nodeSelector | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.affinity }} | ||
| affinity: | ||
| {{ toYaml .Values.affinity | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.podSecurityContext }} | ||
| podSecurityContext: | ||
| {{ toYaml .Values.podSecurityContext | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.tolerations }} | ||
| tolerations: | ||
| {{ toYaml .Values.tolerations | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.TLS }} | ||
| {{- end }} | ||
| {{- if .Values.affinity }} | ||
| affinity: {{ toYaml .Values.affinity | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.tolerations }} | ||
| tolerations: {{ toYaml .Values.tolerations | nindent 4 }} | ||
| {{- end }} | ||
| {{- if and .Values.TLS.ca .Values.TLS.cert .Values.TLS.key .Values.TLS.secret.secretName }} | ||
| TLS: | ||
| {{ toYaml .Values.TLS | indent 4 }} | ||
| {{- end}} | ||
| {{- if .Values.sidecars }} | ||
| sidecars: | ||
| {{ toYaml .Values.sidecars | indent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.serviceAccountName }} | ||
| 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.secret (ne .Values.acl.secret.secretName "") }} | ||
| acl: | ||
| secret: | ||
| secretName: {{ .Values.acl.secret.secretName | quote }} | ||
| {{- end }} | ||
| {{- if and .Values.initContainer .Values.initContainer.enabled (ne .Values.initContainer.image "") }} | ||
| 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 }} | ||
| {{- end }} | ||
| {{- if and .Values.serviceAccountName (ne .Values.serviceAccountName "") }} | ||
| serviceAccountName: "{{ .Values.serviceAccountName }}" | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- if .Values.env }} | ||
| env: {{ toYaml .Values.env | nindent 4 }} | ||
| {{- end }} | ||
|
|
Oops, something went wrong.