diff --git a/rolebinding.yaml b/deploy/controller/templates/rolebinding.yaml similarity index 100% rename from rolebinding.yaml rename to deploy/controller/templates/rolebinding.yaml diff --git a/deploy/redis/templates/_helpers.tpl b/deploy/redis/templates/_helpers.tpl index 14632e0..bbcb964 100644 --- a/deploy/redis/templates/_helpers.tpl +++ b/deploy/redis/templates/_helpers.tpl @@ -13,9 +13,11 @@ {{- define "redis.labels" -}} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} app.kubernetes.io/name: {{ include "redis.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} {{- define "redis.selectorLabels" -}} app.kubernetes.io/name: {{ include "redis.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} diff --git a/deploy/redis/templates/persistentvolumeclaim.yaml b/deploy/redis/templates/persistentvolumeclaim.yaml new file mode 100644 index 0000000..389918d --- /dev/null +++ b/deploy/redis/templates/persistentvolumeclaim.yaml @@ -0,0 +1,18 @@ +{{- if .Values.persistence.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "redis.fullname" . }} + namespace: {{ .Values.metadata.namespace }} + labels: + {{- include "redis.labels" . | nindent 4 }} +spec: + accessModes: + {{- toYaml .Values.persistence.accessModes | nindent 4 }} + {{- if .Values.persistence.storageClassName }} + storageClassName: {{ .Values.persistence.storageClassName }} + {{- end }} + resources: + requests: + storage: {{ .Values.persistence.size }} +{{- end }} diff --git a/deploy/redis/values.yaml b/deploy/redis/values.yaml index 6617652..3166f44 100644 --- a/deploy/redis/values.yaml +++ b/deploy/redis/values.yaml @@ -43,13 +43,13 @@ tolerations: {} affinity: {} -# 持久化配置(可选) +# 持久化配置 persistence: - enabled: false + enabled: true storageClassName: "" accessModes: - ReadWriteOnce - size: 1Gi + size: 10Gi # Redis 配置(无密码模式) redis: diff --git a/deploy/values.yaml b/deploy/values.yaml index 479ffcf..d006655 100644 --- a/deploy/values.yaml +++ b/deploy/values.yaml @@ -33,7 +33,8 @@ controller: # Redis component redis: enabled: true - replicaCount: 3 + # For persistence with ReadWriteOnce access mode, replicaCount must be 1. + replicaCount: 1 name: redis metadata: namespace: aenv