Charts CI

``` Updated: argo/argo-cd: - 5.51.4 bitnami/airflow: - 16.1.5 bitnami/cassandra: - 10.6.6 bitnami/kafka: - 26.4.2 bitnami/mariadb: - 14.1.4 bitnami/mysql: - 9.14.4 bitnami/postgresql: - 13.2.15 bitnami/spark: - 8.1.6 bitnami/tomcat: - 10.11.6 bitnami/wordpress: - 18.1.15 bitnami/zookeeper: - 12.3.3 datadog/datadog: - 3.49.4 haproxy/haproxy: - 1.35.1 jenkins/jenkins: - 4.8.4 jfrog/artifactory-ha: - 107.71.5 jfrog/artifactory-jcr: - 107.71.5 new-relic/nri-bundle: - 5.0.46 speedscale/speedscale-operator: - 1.4.6 stackstate/stackstate-k8s-agent: - 1.0.54 ```
rancher · Nov 22, 2023 · d8978f6 · d8978f6
1 parent 52e7e4a
commit d8978f6
Show file tree

Hide file tree

Showing 115 changed files with 1,255 additions and 292 deletions.
diff --git a/assets/argo/argo-cd-5.51.3.tgz b/assets/argo/argo-cd-5.51.3.tgz
diff --git a/assets/argo/argo-cd-5.51.4.tgz b/assets/argo/argo-cd-5.51.4.tgz
diff --git a/assets/bitnami/airflow-16.1.5.tgz b/assets/bitnami/airflow-16.1.5.tgz
diff --git a/assets/bitnami/cassandra-10.6.6.tgz b/assets/bitnami/cassandra-10.6.6.tgz
diff --git a/assets/bitnami/kafka-26.4.2.tgz b/assets/bitnami/kafka-26.4.2.tgz
diff --git a/assets/bitnami/mariadb-14.1.4.tgz b/assets/bitnami/mariadb-14.1.4.tgz
diff --git a/assets/bitnami/mysql-9.14.4.tgz b/assets/bitnami/mysql-9.14.4.tgz
diff --git a/assets/bitnami/postgresql-13.2.15.tgz b/assets/bitnami/postgresql-13.2.15.tgz
diff --git a/assets/bitnami/spark-8.1.6.tgz b/assets/bitnami/spark-8.1.6.tgz
diff --git a/assets/bitnami/tomcat-10.11.6.tgz b/assets/bitnami/tomcat-10.11.6.tgz
diff --git a/assets/bitnami/wordpress-18.1.15.tgz b/assets/bitnami/wordpress-18.1.15.tgz
diff --git a/assets/bitnami/zookeeper-12.3.3.tgz b/assets/bitnami/zookeeper-12.3.3.tgz
diff --git a/assets/datadog/datadog-3.49.4.tgz b/assets/datadog/datadog-3.49.4.tgz
diff --git a/assets/haproxy/haproxy-1.35.1.tgz b/assets/haproxy/haproxy-1.35.1.tgz
diff --git a/assets/jenkins/jenkins-4.8.4.tgz b/assets/jenkins/jenkins-4.8.4.tgz
diff --git a/assets/jfrog/artifactory-ha-107.71.5.tgz b/assets/jfrog/artifactory-ha-107.71.5.tgz
diff --git a/assets/jfrog/artifactory-jcr-107.71.5.tgz b/assets/jfrog/artifactory-jcr-107.71.5.tgz
diff --git a/assets/new-relic/nri-bundle-5.0.46.tgz b/assets/new-relic/nri-bundle-5.0.46.tgz
diff --git a/assets/speedscale/speedscale-operator-1.4.6.tgz b/assets/speedscale/speedscale-operator-1.4.6.tgz
diff --git a/assets/stackstate/stackstate-k8s-agent-1.0.54.tgz b/assets/stackstate/stackstate-k8s-agent-1.0.54.tgz
diff --git a/charts/argo/argo-cd/Chart.yaml b/charts/argo/argo-cd/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Replace non-existing examples with official example domain (RFC 2606)
+      description: Upgrade Argo CD to v2.9.2
   artifacthub.io/signKey: |
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
@@ -11,7 +11,7 @@ annotations:
   catalog.cattle.io/kube-version: '>=1.23.0-0'
   catalog.cattle.io/release-name: argo-cd
 apiVersion: v2
-appVersion: v2.9.1
+appVersion: v2.9.2
 dependencies:
 - condition: redis-ha.enabled
   name: redis-ha
@@ -33,4 +33,4 @@ name: argo-cd
 sources:
 - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
 - https://github.com/argoproj/argo-cd
-version: 5.51.3
+version: 5.51.4
diff --git a/charts/bitnami/airflow/Chart.lock b/charts/bitnami/airflow/Chart.lock
@@ -1,12 +1,12 @@
 dependencies:
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 18.2.1
+  version: 18.4.0
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 13.2.2
+  version: 13.2.15
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 2.13.3
-digest: sha256:4adb05966b556cfdd809ce479d968d19030d6a967d066acdb997604c05afffd1
-generated: "2023-11-07T02:46:23.255235664Z"
+digest: sha256:15580d67fba89ac0e98a4c479fa1ea4f9015b92d430745ce3f401841b34e3e3d
+generated: "2023-11-22T00:02:07.834943162Z"
diff --git a/charts/bitnami/airflow/Chart.yaml b/charts/bitnami/airflow/Chart.yaml
@@ -8,15 +8,15 @@ annotations:
     - name: airflow-exporter
       image: docker.io/bitnami/airflow-exporter:0.20220314.0-debian-11-r440
     - name: airflow-scheduler
-      image: docker.io/bitnami/airflow-scheduler:2.7.3-debian-11-r0
+      image: docker.io/bitnami/airflow-scheduler:2.7.3-debian-11-r1
     - name: airflow-worker
-      image: docker.io/bitnami/airflow-worker:2.7.3-debian-11-r0
+      image: docker.io/bitnami/airflow-worker:2.7.3-debian-11-r2
     - name: airflow
-      image: docker.io/bitnami/airflow:2.7.3-debian-11-r0
+      image: docker.io/bitnami/airflow:2.7.3-debian-11-r1
     - name: git
-      image: docker.io/bitnami/git:2.42.1-debian-11-r0
+      image: docker.io/bitnami/git:2.43.0-debian-11-r0
     - name: os-shell
-      image: docker.io/bitnami/os-shell:11-debian-11-r90
+      image: docker.io/bitnami/os-shell:11-debian-11-r91
   licenses: Apache-2.0
 apiVersion: v2
 appVersion: 2.7.3
@@ -50,4 +50,4 @@ maintainers:
 name: airflow
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/airflow
-version: 16.1.2
+version: 16.1.5
diff --git a/charts/bitnami/airflow/README.md b/charts/bitnami/airflow/README.md
@@ -1,6 +1,6 @@
 <!--- app-name: Apache Airflow -->
 
-# Apache Airflow packaged by Bitnami
+# Bitnami package for Apache Airflow
 
 Apache Airflow is a tool to express and execute workflows as directed acyclic graphs (DAGs). It includes utilities to schedule tasks, monitor task progress and handle task dependencies.
 
@@ -11,19 +11,17 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema
 ## TL;DR
 
 ```console
-helm install my-release oci://REGISTRY_NAME/REPOSITORY_NAME/airflow
+helm install my-release oci://registry-1.docker.io/bitnamicharts/airflow
 ```
 
-> Note: You need to substitute the placeholders `REGISTRY_NAME` and `REPOSITORY_NAME` with a reference to your Helm chart registry and repository. For example, in the case of Bitnami, you need to use `REGISTRY_NAME=registry-1.docker.io` and `REPOSITORY_NAME=bitnamicharts`.
+Looking to use Apache Airflow in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog.
 
 ## Introduction
 
 This chart bootstraps an [Apache Airflow](https://github.com/bitnami/containers/tree/main/bitnami/airflow) deployment on a [Kubernetes](https://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters.
 
-Looking to use Apache Airflow in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog.
-
 ## Prerequisites
 
 - Kubernetes 1.23+
@@ -521,7 +519,7 @@ helm install my-release -f values.yaml oci://REGISTRY_NAME/REPOSITORY_NAME/airfl
 ```
 
 > Note: You need to substitute the placeholders `REGISTRY_NAME` and `REPOSITORY_NAME` with a reference to your Helm chart registry and repository. For example, in the case of Bitnami, you need to use `REGISTRY_NAME=registry-1.docker.io` and `REPOSITORY_NAME=bitnamicharts`.
-> **Tip**: You can use the default [values.yaml](values.yaml)
+> **Tip**: You can use the default [values.yaml](https://github.com/bitnami/charts/tree/main/bitnami/airflow/values.yaml)
 
 ## Configuration and installation details
 

diff --git a/charts/bitnami/airflow/charts/postgresql/Chart.yaml b/charts/bitnami/airflow/charts/postgresql/Chart.yaml
@@ -2,14 +2,14 @@ annotations:
   category: Database
   images: |
     - name: os-shell
-      image: docker.io/bitnami/os-shell:11-debian-11-r90
+      image: docker.io/bitnami/os-shell:11-debian-11-r91
     - name: postgres-exporter
-      image: docker.io/bitnami/postgres-exporter:0.15.0-debian-11-r0
+      image: docker.io/bitnami/postgres-exporter:0.15.0-debian-11-r2
     - name: postgresql
-      image: docker.io/bitnami/postgresql:16.0.0-debian-11-r15
+      image: docker.io/bitnami/postgresql:16.1.0-debian-11-r9
   licenses: Apache-2.0
 apiVersion: v2
-appVersion: 16.0.0
+appVersion: 16.1.0
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
@@ -34,4 +34,4 @@ maintainers:
 name: postgresql
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/postgresql
-version: 13.2.2
+version: 13.2.15
diff --git a/charts/bitnami/airflow/charts/postgresql/README.md b/charts/bitnami/airflow/charts/postgresql/README.md
@@ -1,6 +1,6 @@
 <!--- app-name: PostgreSQL -->
 
-# PostgreSQL packaged by Bitnami
+# Bitnami package for PostgreSQL
 
 PostgreSQL (Postgres) is an open source object-relational database known for reliability and data integrity. ACID-compliant, it supports foreign keys, joins, views, triggers and stored procedures.
 
@@ -11,10 +11,10 @@ Trademarks: This software listing is packaged by Bitnami. The respective tradema
 ## TL;DR
 
 ```console
-helm install my-release oci://REGISTRY_NAME/REPOSITORY_NAME/postgresql
+helm install my-release oci://registry-1.docker.io/bitnamicharts/postgresql
 ```
 
-> Note: You need to substitute the placeholders `REGISTRY_NAME` and `REPOSITORY_NAME` with a reference to your Helm chart registry and repository. For example, in the case of Bitnami, you need to use `REGISTRY_NAME=registry-1.docker.io` and `REPOSITORY_NAME=bitnamicharts`.
+Looking to use PostgreSQL in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog.
 
 ## Introduction
 
@@ -24,8 +24,6 @@ For HA, please see [this repo](https://github.com/bitnami/charts/tree/main/bitna
 
 Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters.
 
-Looking to use PostgreSQL in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the enterprise edition of Bitnami Application Catalog.
-
 ## Prerequisites
 
 - Kubernetes 1.23+
@@ -543,7 +541,7 @@ helm install my-release -f values.yaml oci://REGISTRY_NAME/REPOSITORY_NAME/postg
 ```
 
 > Note: You need to substitute the placeholders `REGISTRY_NAME` and `REPOSITORY_NAME` with a reference to your Helm chart registry and repository. For example, in the case of Bitnami, you need to use `REGISTRY_NAME=registry-1.docker.io` and `REPOSITORY_NAME=bitnamicharts`.
-> **Tip**: You can use the default [values.yaml](values.yaml)
+> **Tip**: You can use the default [values.yaml](https://github.com/bitnami/charts/tree/main/bitnami/postgresql/values.yaml)
 
 ## Configuration and installation details
 

diff --git a/charts/bitnami/airflow/charts/postgresql/values.yaml b/charts/bitnami/airflow/charts/postgresql/values.yaml
@@ -98,7 +98,7 @@ diagnosticMode:
 image:
   registry: docker.io
   repository: bitnami/postgresql
-  tag: 16.0.0-debian-11-r15
+  tag: 16.1.0-debian-11-r9
   digest: ""
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -1300,7 +1300,7 @@ volumePermissions:
   image:
     registry: docker.io
     repository: bitnami/os-shell
-    tag: 11-debian-11-r90
+    tag: 11-debian-11-r91
     digest: ""
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
@@ -1401,7 +1401,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/postgres-exporter
-    tag: 0.15.0-debian-11-r0
+    tag: 0.15.0-debian-11-r2
     digest: ""
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.

diff --git a/charts/bitnami/airflow/charts/redis/Chart.yaml b/charts/bitnami/airflow/charts/redis/Chart.yaml
@@ -2,13 +2,13 @@ annotations:
   category: Database
   images: |
     - name: os-shell
-      image: docker.io/bitnami/os-shell:11-debian-11-r90
+      image: docker.io/bitnami/os-shell:11-debian-11-r91
     - name: redis-exporter
-      image: docker.io/bitnami/redis-exporter:1.55.0-debian-11-r0
+      image: docker.io/bitnami/redis-exporter:1.55.0-debian-11-r2
     - name: redis-sentinel
-      image: docker.io/bitnami/redis-sentinel:7.2.3-debian-11-r0
+      image: docker.io/bitnami/redis-sentinel:7.2.3-debian-11-r1
     - name: redis
-      image: docker.io/bitnami/redis:7.2.3-debian-11-r0
+      image: docker.io/bitnami/redis:7.2.3-debian-11-r1
   licenses: Apache-2.0
 apiVersion: v2
 appVersion: 7.2.3
@@ -33,4 +33,4 @@ maintainers:
 name: redis
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/redis
-version: 18.2.1
+version: 18.4.0
diff --git a/charts/bitnami/airflow/charts/redis/README.md b/charts/bitnami/airflow/charts/redis/README.md
@@ -172,7 +172,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `master.containerSecurityContext.allowPrivilegeEscalation` | Is it possible to escalate Redis&reg; pod(s) privileges                                               | `false`                  |
 | `master.containerSecurityContext.seccompProfile.type`      | Set Redis&reg; master containers' Security Context seccompProfile                                     | `RuntimeDefault`         |
 | `master.containerSecurityContext.capabilities.drop`        | Set Redis&reg; master containers' Security Context capabilities to drop                               | `["ALL"]`                |
-| `master.kind`                                              | Use either Deployment or StatefulSet (default)                                                        | `StatefulSet`            |
+| `master.kind`                                              | Use either Deployment, StatefulSet (default) or DaemonSet                                             | `StatefulSet`            |
 | `master.schedulerName`                                     | Alternate scheduler for Redis&reg; master pods                                                        | `""`                     |
 | `master.updateStrategy.type`                               | Redis&reg; master statefulset strategy type                                                           | `RollingUpdate`          |
 | `master.minReadySeconds`                                   | How many seconds a pod needs to be ready before killing the next, during update                       | `0`                      |
@@ -237,6 +237,7 @@ The command removes all the Kubernetes components associated with the chart and
 
 | Name                                                        | Description                                                                                             | Value                    |
 | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------ |
+| `replica.kind`                                              | Use either DaemonSet or StatefulSet (default)                                                           | `StatefulSet`            |
 | `replica.replicaCount`                                      | Number of Redis&reg; replicas to deploy                                                                 | `3`                      |
 | `replica.configuration`                                     | Configuration for Redis&reg; replicas nodes                                                             | `""`                     |
 | `replica.disableCommands`                                   | Array with Redis&reg; commands to disable on replicas nodes                                             | `["FLUSHDB","FLUSHALL"]` |
@@ -363,7 +364,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `sentinel.annotations`                                       | Additional custom annotations for Redis&reg; Sentinel resource                                                                              | `{}`                             |
 | `sentinel.masterSet`                                         | Master set name                                                                                                                             | `mymaster`                       |
 | `sentinel.quorum`                                            | Sentinel Quorum                                                                                                                             | `2`                              |
-| `sentinel.getMasterTimeout`                                  | Amount of time to allow before get_sentinel_master_info() times out.                                                                        | `99`                             |
+| `sentinel.getMasterTimeout`                                  | Amount of time to allow before get_sentinel_master_info() times out.                                                                        | `90`                             |
 | `sentinel.automateClusterRecovery`                           | Automate cluster recovery in cases where the last replica is not considered a good replica and Sentinel won't automatically failover to it. | `false`                          |
 | `sentinel.redisShutdownWaitFailover`                         | Whether the Redis&reg; master container waits for the failover at shutdown (in addition to the Redis&reg; Sentinel container).              | `true`                           |
 | `sentinel.downAfterMilliseconds`                             | Timeout for detecting a Redis&reg; node is down                                                                                             | `60000`                          |

diff --git a/charts/bitnami/airflow/charts/redis/templates/_helpers.tpl b/charts/bitnami/airflow/charts/redis/templates/_helpers.tpl
@@ -44,7 +44,7 @@ Return sysctl image
 Return the proper Docker Image Registry Secret Names
 */}}
 {{- define "redis.imagePullSecrets" -}}
-{{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.sentinel.image .Values.metrics.image .Values.volumePermissions.image .Values.sysctl.image) "global" .Values.global) -}}
+{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.image .Values.sentinel.image .Values.metrics.image .Values.volumePermissions.image .Values.sysctl.image) "context" $) -}}
 {{- end -}}
 
 {{/*

diff --git a/charts/bitnami/airflow/charts/redis/templates/master/application.yaml b/charts/bitnami/airflow/charts/redis/templates/master/application.yaml
@@ -3,6 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
+{{- if gt (int64 .Values.master.count) 0 -}}
 {{- if or (not (eq .Values.architecture "replication")) (not .Values.sentinel.enabled) }}
 apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
 kind: {{ .Values.master.kind }}
@@ -15,7 +16,9 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not (eq .Values.master.kind "DaemonSet") }}
   replicas: {{ .Values.master.count }}
+  {{- end }}
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.master.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
@@ -471,7 +474,7 @@ spec:
         {{- if .Values.metrics.extraVolumes }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }}
         {{- end }}
-  {{- if not .Values.master.persistence.enabled }}
+  {{- if or (not .Values.master.persistence.enabled) (eq .Values.master.kind "DaemonSet") }}
         - name: redis-data
           {{- if or .Values.master.persistence.medium .Values.master.persistence.sizeLimit }}
           emptyDir:
@@ -526,3 +529,4 @@ spec:
         {{- include "common.storage.class" (dict "persistence" .Values.master.persistence "global" .Values.global) | nindent 8 }}
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/charts/bitnami/airflow/charts/redis/templates/master/service.yaml b/charts/bitnami/airflow/charts/redis/templates/master/service.yaml
@@ -3,7 +3,7 @@ Copyright VMware, Inc.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
-{{- if not .Values.sentinel.enabled }}
+{{- if and (not .Values.sentinel.enabled) (gt (int64 .Values.master.count) 0) }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/...redis/templates/replicas/statefulset.yaml → ...redis/templates/replicas/application.yaml b/...redis/templates/replicas/statefulset.yaml → ...redis/templates/replicas/application.yaml
@@ -5,7 +5,7 @@ SPDX-License-Identifier: APACHE-2.0
 
 {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
 apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
-kind: StatefulSet
+kind: {{ .Values.replica.kind }}
 metadata:
   name: {{ printf "%s-replicas" (include "common.names.fullname" .) }}
   namespace: {{ .Release.Namespace | quote }}
@@ -15,14 +15,16 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  {{- if not .Values.replica.autoscaling.enabled }}
+  {{- if and (not (eq .Values.replica.kind "DaemonSet")) (not .Values.replica.autoscaling.enabled) }}
   replicas: {{ .Values.replica.replicaCount }}
   {{- end }}
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.replica.podLabels .Values.commonLabels ) "context" . ) }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
       app.kubernetes.io/component: replica
+  {{- if (eq .Values.replica.kind "StatefulSet") }}
   serviceName: {{ printf "%s-headless" (include "common.names.fullname" .) }}
+  {{- end }}
   {{- if .Values.replica.updateStrategy }}
   updateStrategy: {{- toYaml .Values.replica.updateStrategy | nindent 4 }}
   {{- end }}
@@ -131,13 +133,19 @@ spec:
             - name: REDIS_REPLICATION_MODE
               value: replica
             - name: REDIS_MASTER_HOST
-            {{- if and (eq (int64 .Values.master.count) 1) (ne .Values.master.kind "Deployment") }}
+            {{- if .Values.replica.externalMaster.enabled }}
+              value: {{ .Values.replica.externalMaster.host | quote }}
+            {{- else if and (eq (int64 .Values.master.count) 1) (eq .Values.master.kind "StatefulSet") }}
               value: {{ template "common.names.fullname" . }}-master-0.{{ template "common.names.fullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
             {{- else }}
               value: {{ template "common.names.fullname" . }}-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
             {{- end }}
             - name: REDIS_MASTER_PORT_NUMBER
+            {{- if .Values.replica.externalMaster.enabled }}
+              value: {{ .Values.replica.externalMaster.port | quote }}
+            {{- else }}
               value: {{ .Values.master.containerPorts.redis | quote }}
+            {{- end }}
             - name: ALLOW_EMPTY_PASSWORD
               value: {{ ternary "no" "yes" .Values.auth.enabled | quote }}
             {{- if .Values.auth.enabled }}
@@ -472,7 +480,7 @@ spec:
         {{- if .Values.metrics.extraVolumes }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.extraVolumes "context" $ ) | nindent 8 }}
         {{- end }}
-  {{- if not .Values.replica.persistence.enabled }}
+  {{- if or (not .Values.replica.persistence.enabled) (not (eq .Values.replica.kind "StatefulSet")) }}
         - name: redis-data
           {{- if or .Values.replica.persistence.medium .Values.replica.persistence.sizeLimit }}
           emptyDir: