diff --git a/charts/redis-cluster/Chart.yaml b/charts/redis-cluster/Chart.yaml index 1f011ef5..4f503b7d 100644 --- a/charts/redis-cluster/Chart.yaml +++ b/charts/redis-cluster/Chart.yaml @@ -8,8 +8,7 @@ maintainers: name: redis-cluster sources: - https://github.com/ot-container-kit/redis-operator -version: 0.14.3 - +version: 0.14.4 appVersion: "0.14.0" home: https://github.com/ot-container-kit/redis-operator keywords: diff --git a/charts/redis-cluster/templates/extra-config.yaml b/charts/redis-cluster/templates/extra-config.yaml index e751f561..02a34f05 100644 --- a/charts/redis-cluster/templates/extra-config.yaml +++ b/charts/redis-cluster/templates/extra-config.yaml @@ -1,4 +1,4 @@ -{{- if eq .Values.externalConfig.enabled true }} +{{- if .Values.externalConfig.enabled }} --- apiVersion: v1 kind: ConfigMap diff --git a/charts/redis-cluster/templates/follower-service.yaml b/charts/redis-cluster/templates/follower-service.yaml index 8147a444..0f8c6b14 100644 --- a/charts/redis-cluster/templates/follower-service.yaml +++ b/charts/redis-cluster/templates/follower-service.yaml @@ -1,13 +1,9 @@ -{{- if and (gt (int .Values.redisCluster.follower.replicas) 0) (eq .Values.externalService.enabled true) }} +{{- if and .Values.externalService.enabled (gt (int .Values.redisCluster.follower.replicas) 0) }} --- apiVersion: v1 kind: Service metadata: name: {{ .Release.Name }}-follower-external-service -{{- if .Values.externalService.annotations }} - annotations: -{{ toYaml .Values.externalService.annotations | indent 4 }} -{{- end }} labels: app.kubernetes.io/name: {{ .Release.Name }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} @@ -15,6 +11,10 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.externalService.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.externalService.serviceType }} selector: diff --git a/charts/redis-cluster/templates/follower-sm.yaml b/charts/redis-cluster/templates/follower-sm.yaml deleted file mode 100644 index 18ffaead..00000000 --- a/charts/redis-cluster/templates/follower-sm.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if and (eq .Values.serviceMonitor.enabled true) (gt (int .Values.redisCluster.follower.replicas) 0) }} ---- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ .Release.Name }}-follower-prometheus-monitoring - 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 -spec: - selector: - matchLabels: - app: {{ .Release.Name }}-follower - redis_setup_type: cluster - role: follower - endpoints: - - port: redis-exporter - interval: {{ .Values.serviceMonitor.interval }} - scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} - namespaceSelector: - matchNames: - - {{ .Values.serviceMonitor.namespace }} -{{- end }} diff --git a/charts/redis-cluster/templates/leader-service.yaml b/charts/redis-cluster/templates/leader-service.yaml index 05f459ac..f936b579 100644 --- a/charts/redis-cluster/templates/leader-service.yaml +++ b/charts/redis-cluster/templates/leader-service.yaml @@ -1,13 +1,9 @@ -{{- if and (gt (int .Values.redisCluster.leader.replicas) 0) (eq .Values.externalService.enabled true) }} +{{- if and .Values.externalService.enabled (gt (int .Values.redisCluster.leader.replicas) 0) }} --- apiVersion: v1 kind: Service metadata: name: {{ .Release.Name }}-leader-external-service -{{- if .Values.externalService.annotations }} - annotations: -{{ toYaml .Values.externalService.annotations | indent 4 }} -{{- end }} labels: app.kubernetes.io/name: {{ .Release.Name }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} @@ -15,6 +11,10 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.externalService.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.externalService.serviceType }} selector: diff --git a/charts/redis-cluster/templates/redis-cluster.yaml b/charts/redis-cluster/templates/redis-cluster.yaml index 3bb99eb6..e14b1726 100644 --- a/charts/redis-cluster/templates/redis-cluster.yaml +++ b/charts/redis-cluster/templates/redis-cluster.yaml @@ -10,98 +10,104 @@ metadata: 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 }} + {{- with .Values.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: clusterSize: {{ .Values.redisCluster.clusterSize }} persistenceEnabled: {{ .Values.redisCluster.persistenceEnabled }} clusterVersion: {{ .Values.redisCluster.clusterVersion }} + {{- with .Values.redisCluster.leader }} redisLeader: -{{- if .Values.redisCluster.leader.affinity }} + {{- with .affinity }} affinity: -{{ toYaml .Values.redisCluster.leader.affinity | nindent 6 }} -{{- end }} - replicas: {{ .Values.redisCluster.leader.replicas }} -{{- if eq .Values.externalConfig.enabled true }} + {{- toYaml . | nindent 6 }} + {{- end }} + replicas: {{ .replicas }} + {{- if $.Values.externalConfig.enabled }} redisConfig: additionalRedisConfig: {{ .Release.Name }}-ext-config -{{- end }} -{{- if eq .Values.pdb.enabled true }} + {{- end }} + {{- with $.Values.pdb }} + {{- if .enabled }} pdb: - enabled: {{ .Values.pdb.enabled }} - {{- if .Values.pdb.maxUnavailable }} - maxUnavailable: {{ .Values.pdb.maxUnavailable }} + enabled: true + {{- with .maxUnavailable }} + maxUnavailable: {{ . }} {{- end }} - {{- if .Values.pdb.minAvailable }} - minAvailable: {{ .Values.pdb.minAvailable }} + {{- with .minAvailable }} + minAvailable: {{ . }} {{- end }} -{{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- with .Values.redisCluster.follower }} redisFollower: -{{- if .Values.redisCluster.follower.affinity }} + {{- with .affinity }} affinity: -{{ toYaml .Values.redisCluster.follower.affinity | nindent 6 }} -{{- end }} - replicas: {{ .Values.redisCluster.follower.replicas }} -{{- if eq .Values.externalConfig.enabled true }} + {{- toYaml . | nindent 6 }} + {{- end }} + replicas: {{ .replicas }} + {{- if $.Values.externalConfig.enabled }} redisConfig: additionalRedisConfig: {{ .Release.Name }}-ext-config -{{- end }} -{{- if eq .Values.pdb.enabled true }} + {{- end }} + {{- with $.Values.pdb }} + {{- if .enabled }} pdb: - enabled: {{ .Values.pdb.enabled }} - {{- if .Values.pdb.maxUnavailable }} - maxUnavailable: {{ .Values.pdb.maxUnavailable }} + enabled: true + {{- with .maxUnavailable }} + maxUnavailable: {{ . }} {{- end }} - {{- if .Values.pdb.minAvailable }} - minAvailable: {{ .Values.pdb.minAvailable }} + {{- with .minAvailable }} + minAvailable: {{ . }} {{- end }} -{{- end }} + {{- end }} + {{- end }} + {{- end }} redisExporter: enabled: {{ .Values.redisExporter.enabled }} image: "{{ .Values.redisExporter.image }}:{{ .Values.redisExporter.tag }}" imagePullPolicy: "{{ .Values.redisExporter.imagePullPolicy }}" resources: -{{ toYaml .Values.redisExporter.resources | indent 6 }} + {{- toYaml .Values.redisExporter.resources | nindent 6 }} kubernetesConfig: image: "{{ .Values.redisCluster.image }}:{{ .Values.redisCluster.tag }}" imagePullPolicy: "{{ .Values.redisCluster.imagePullPolicy }}" resources: -{{ toYaml .Values.redisCluster.resources | indent 6 }} -{{- if .Values.redisCluster.redisSecret }} + {{- toYaml .Values.redisCluster.resources | nindent 6 }} + {{- with .Values.redisCluster.redisSecret }} redisSecret: - name: "{{ .Values.redisCluster.redisSecret.secretName }}" - key: "{{ .Values.redisCluster.redisSecret.secretKey }}" -{{- end }} -{{- if .Values.storageSpec }} + name: "{{ .secretName }}" + key: "{{ .secretKey }}" + {{- end }} + {{- with .Values.storageSpec }} storage: -{{ toYaml .Values.storageSpec | indent 4 }} -{{- end }} -{{- if .Values.priorityClassName }} - priorityClassName: "{{ .Values.priorityClassName }}" -{{- end }} -{{- if .Values.nodeSelector }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.priorityClassName }} + priorityClassName: "{{ . }}" + {{- end }} + {{- with .Values.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeSelector | indent 4 }} -{{- end }} -{{- if .Values.securityContext }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.securityContext }} securityContext: -{{ toYaml .Values.securityContext | indent 4 }} -{{- end }} -{{- if .Values.tolerations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- if .Values.tolerations }} tolerations: -{{ toYaml .Values.tolerations | indent 4 }} -{{- end }} -{{- if .Values.TLS }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.TLS }} TLS: -{{ toYaml .Values.TLS | indent 4 }} -{{- end}} -{{- if .Values.sidecars }} + {{ toYaml . | nindent 4 }} + {{- end}} + {{- with .Values.sidecars }} sidecars: -{{ toYaml .Values.sidecars | indent 4 }} -{{- end }} -{{- if .Values.serviceAccountName }} - serviceAccountName: "{{ .Values.serviceAccountName }}" -{{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.serviceAccountName }} + serviceAccountName: "{{ . }}" + {{- end }} diff --git a/charts/redis-cluster/templates/leader-sm.yaml b/charts/redis-cluster/templates/service-monitor.yaml similarity index 59% rename from charts/redis-cluster/templates/leader-sm.yaml rename to charts/redis-cluster/templates/service-monitor.yaml index 58d4f2a0..355dab7b 100644 --- a/charts/redis-cluster/templates/leader-sm.yaml +++ b/charts/redis-cluster/templates/service-monitor.yaml @@ -1,27 +1,28 @@ -{{- if and (eq .Values.serviceMonitor.enabled true) (gt (int .Values.redisCluster.leader.replicas) 0) }} +{{- if and .Values.serviceMonitor.enabled }} --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ .Release.Name }}-leader-prometheus-monitoring 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/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware spec: selector: matchLabels: - app: {{ .Release.Name }}-leader + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/name: {{ .Release.Name }} redis_setup_type: cluster - role: leader endpoints: - - port: redis-exporter - interval: {{ .Values.serviceMonitor.interval }} - scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} + - port: redis-exporter + interval: {{ .Values.serviceMonitor.interval }} + scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} namespaceSelector: matchNames: - - {{ .Values.serviceMonitor.namespace }} + - {{ .Values.serviceMonitor.namespace }} {{- end }} diff --git a/charts/redis-operator/Chart.yaml b/charts/redis-operator/Chart.yaml index 732feb60..7613e637 100644 --- a/charts/redis-operator/Chart.yaml +++ b/charts/redis-operator/Chart.yaml @@ -1,6 +1,6 @@ --- apiVersion: v2 -version: 0.14.3 +version: 0.14.4 appVersion: "0.14.0" description: Provides easy redis setup definitions for Kubernetes services, and deployment. engine: gotpl diff --git a/charts/redis-operator/templates/operator-deployment.yaml b/charts/redis-operator/templates/deployment.yaml similarity index 64% rename from charts/redis-operator/templates/operator-deployment.yaml rename to charts/redis-operator/templates/deployment.yaml index a1fcbfc0..2c97f757 100644 --- a/charts/redis-operator/templates/operator-deployment.yaml +++ b/charts/redis-operator/templates/deployment.yaml @@ -24,41 +24,42 @@ spec: {{- end }} labels: name: {{ .Values.redisOperator.name }} - {{- with .Values.redisOperator.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} + {{- with .Values.redisOperator.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: containers: - name: "{{ .Values.redisOperator.name }}" image: "{{ .Values.redisOperator.imageName }}:{{ .Values.redisOperator.imageTag | default (printf "v%s" .Chart.AppVersion) }}" - imagePullPolicy: {{ .Values.redisOperator.imagePullPolicy }} + imagePullPolicy: "{{ .Values.redisOperator.imagePullPolicy }}" command: - - /manager + - /manager args: - - --leader-elect -{{- if .Values.watch_namespace }} + - "--leader-elect" + {{- with .Values.watch_namespace }} env: - name: NAMESPACE - value: {{ .Values.watch_namespace }} -{{- end }} -{{- if .Values.resources }} + value: "{{ . }}" + {{- end }} + {{- with .Values.resources }} resources: -{{ toYaml .Values.resources | indent 10 }} -{{- end }} + {{- toYaml . | nindent 10 }} + {{- end }} nodeSelector: -{{- with .Values.nodeSelector }} -{{ toYaml . | indent 8 }} -{{- end }} + {{- with .Values.nodeSelector }} + {{- toYaml . | nindent 8 }} + {{- end }} priorityClassName: {{ .Values.priorityClassName }} -{{- with .Values.affinity }} - affinity: {{ toYaml . | nindent 8 }} -{{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} tolerations: -{{- if .Values.tolerateAllTaints }} + {{- if .Values.tolerateAllTaints }} - operator: Exists -{{- end }} -{{- with .Values.tolerations }} -{{ toYaml . | indent 8 }} -{{- end }} + {{- end }} + {{- with .Values.tolerations }} + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: "{{ .Values.serviceAccountName }}" serviceAccount: "{{ .Values.serviceAccountName }}" diff --git a/charts/redis-sentinel/Chart.yaml b/charts/redis-sentinel/Chart.yaml index 56f3b4a5..e2f7d9d0 100644 --- a/charts/redis-sentinel/Chart.yaml +++ b/charts/redis-sentinel/Chart.yaml @@ -9,7 +9,7 @@ maintainers: name: redis-sentinel sources: - https://github.com/ot-container-kit/redis-operator -version: 0.14.2 +version: 0.14.3 appVersion: "0.14.0" home: https://github.com/ot-container-kit/redis-operator keywords: diff --git a/charts/redis-sentinel/templates/extra-config.yaml b/charts/redis-sentinel/templates/extra-config.yaml index e751f561..02a34f05 100644 --- a/charts/redis-sentinel/templates/extra-config.yaml +++ b/charts/redis-sentinel/templates/extra-config.yaml @@ -1,4 +1,4 @@ -{{- if eq .Values.externalConfig.enabled true }} +{{- if .Values.externalConfig.enabled }} --- apiVersion: v1 kind: ConfigMap diff --git a/charts/redis-sentinel/templates/redis-sentinel.yaml b/charts/redis-sentinel/templates/redis-sentinel.yaml index a436de82..7402dd11 100644 --- a/charts/redis-sentinel/templates/redis-sentinel.yaml +++ b/charts/redis-sentinel/templates/redis-sentinel.yaml @@ -10,70 +10,65 @@ metadata: 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 }} + {{- with .Values.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: clusterSize: {{ .Values.redisSentinel.clusterSize }} -# Sentinel Config + # Sentinel Config redisSentinelConfig: - redisReplicationName: {{ .Values.redisSentinelConfig.redisReplicationName}} - masterGroupName : {{ .Values.redisSentinelConfig.masterGroupName | default "myMaster" | quote}} - redisPort: {{ .Values.redisSentinelConfig.redisPort | default "6379" | quote}} - quorum: {{ .Values.redisSentinelConfig.quorum | default "2" | quote}} - parallelSyncs: {{ .Values.redisSentinelConfig.parallelSyncs | default "1" | quote}} - failoverTimeout: {{ .Values.redisSentinelConfig.failoverTimeout | default "180000" | quote}} - downAfterMilliseconds: {{ .Values.redisSentinelConfig.downAfterMilliseconds | default "30000" | quote}} -{{- if eq .Values.externalConfig.enabled true }} - additionalSentinelConfig: {{ .Release.Name }}-ext-config -{{- end }} -# Kubernetes Config + redisReplicationName: {{ .Values.redisSentinelConfig.redisReplicationName }} + masterGroupName: {{ .Values.redisSentinelConfig.masterGroupName | default "myMaster" | quote }} + redisPort: {{ .Values.redisSentinelConfig.redisPort | default "6379" | quote }} + quorum: {{ .Values.redisSentinelConfig.quorum | default "2" | quote }} + parallelSyncs: {{ .Values.redisSentinelConfig.parallelSyncs | default "1" | quote }} + failoverTimeout: {{ .Values.redisSentinelConfig.failoverTimeout | default "180000" | quote }} + downAfterMilliseconds: {{ .Values.redisSentinelConfig.downAfterMilliseconds | default "30000" | quote }} + {{- if .Values.externalConfig.enabled }} + additionalSentinelConfig: "{{ .Release.Name }}-ext-config" + {{- end }} + # Kubernetes Config kubernetesConfig: image: "{{ .Values.redisSentinel.image }}:{{ .Values.redisSentinel.tag }}" imagePullPolicy: "{{ .Values.redisSentinel.imagePullPolicy }}" resources: -{{ toYaml .Values.redisSentinel.resources | indent 6 }} -{{- if .Values.redisSentinel.redisSecret }} + {{- toYaml .Values.redisSentinel.resources | nindent 6 }} + {{- with .Values.redisSentinel.redisSecret }} redisSecret: - name: "{{ .Values.redisSentinel.redisSecret.secretName }}" - key: "{{ .Values.redisSentinel.redisSecret.secretKey }}" -{{- end }} -{{- if .Values.imagePullSecrets }} + name: "{{ .secretName }}" + key: "{{ .secretKey }}" + {{- end }} + {{- with .Values.imagePullSecrets }} imagePullSecrets: -{{- range $imageSecrets := .Values.imagePullSecrets }} - - name: {{ $imageSecrets.name }} -{{- end }} -{{- end }} - -{{- if .Values.priorityClassName }} - priorityClassName: "{{ .Values.priorityClassName }}" -{{- end }} -{{- if .Values.nodeSelector }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.priorityClassName }} + priorityClassName: "{{ . }}" + {{- end }} + {{- with .Values.nodeSelector }} nodeSelector: -{{ toYaml .Values.nodeSelector | indent 4 }} -{{- end }} -{{- if .Values.affinity }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.affinity }} affinity: -{{ toYaml .Values.affinity | indent 4 }} -{{- end }} -{{- if .Values.securityContext }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.securityContext }} securityContext: -{{ toYaml .Values.securityContext | indent 4 }} -{{- end }} -{{- if .Values.tolerations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.tolerations }} tolerations: -{{ toYaml .Values.tolerations | indent 4 }} -{{- end }} -{{- if .Values.TLS }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.TLS }} TLS: -{{ toYaml .Values.TLS | indent 4 }} -{{- end}} -{{- if .Values.sidecars }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.sidecars }} sidecars: -{{ toYaml .Values.sidecars | indent 4 }} -{{- end }} -{{- if .Values.serviceAccountName }} - serviceAccountName: "{{ .Values.serviceAccountName }}" -{{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.serviceAccountName }} + serviceAccountName: "{{ . }}" + {{- end }} diff --git a/charts/redis-sentinel/templates/service.yaml b/charts/redis-sentinel/templates/service.yaml index 3dfb5991..4c0f6a14 100644 --- a/charts/redis-sentinel/templates/service.yaml +++ b/charts/redis-sentinel/templates/service.yaml @@ -1,13 +1,9 @@ -{{- if eq .Values.externalService.enabled true }} +{{- if .Values.externalService.enabled }} --- apiVersion: v1 kind: Service metadata: name: {{ .Release.Name }}-external-service -{{- if .Values.externalService.annotations }} - annotations: -{{ toYaml .Values.externalService.annotations | indent 4 }} -{{- end }} labels: app.kubernetes.io/name: {{ .Release.Name }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} @@ -15,6 +11,10 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: middleware + {{- with .Values.externalService.annotations }} + annotations: + {{ toYaml . | nindent 4 }} + {{- end }} spec: type: {{ .Values.externalService.serviceType }} selector: