[charts/redis-ha] Add component: haproxy to relevant selectors.

charts/redis-ha/Chart.yaml

@@ -5,10 +5,10 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 4.34.0
+version: 4.34.1
 appVersion: 7.2.7
 description: This Helm chart provides a highly available Redis implementation with a master/slave configuration and uses Sentinel sidecars for failover management
-icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
+icon: https://img.icons8.com/external-tal-revivo-shadow-tal-revivo/24/external-redis-an-in-memory-data-structure-project-implementing-a-distributed-logo-shadow-tal-revivo.png
 maintainers:
 - email: aaron.layfield@gmail.com
   name: dandydeveloper

charts/redis-ha/README.md

@@ -484,3 +484,12 @@ As a result, from this version onwards Kubernetes versions older than 1.19 will
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
+
+## 4.34.1 - Upgrade may complain about selector label changes being immutable
+This version introduced changes to the selector labels for the Deployments. Depending on the policies in your cluster, you may see an error like this when upgrading:
+
+```
+Error: UPGRADE FAILED: cannot patch "redis-redis-ha-haproxy" with kind Deployment: Deployment.apps "redis-redis-ha-haproxy" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app":"redis-ha-haproxy", "component":"haproxy", "release":"redis"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable
+```
+
+In these cases, you'll need to delete the Deployment for the haproxy, or simple do a forceful upgrade. 

charts/redis-ha/templates/redis-haproxy-deployment.yaml

@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "labels.standard" . | indent 4 }}
+    component: haproxy
     {{- range $key, $value := .Values.extraLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
@@ -26,12 +27,14 @@ spec:
     matchLabels:
       app: {{ template "redis-ha.name" . }}-haproxy
       release: {{ .Release.Name }}
+      component: haproxy
   template:
     metadata:
       name: {{ template "redis-ha.fullname" . }}-haproxy
       labels:
         app: {{ template "redis-ha.name" . }}-haproxy
         release: {{ .Release.Name }}
+        component: haproxy
         {{- range $key, $value := .Values.haproxy.labels }}
         {{ $key }}: {{ $value | toString }}
         {{- end }}
@@ -77,6 +80,7 @@ spec:
                 matchLabels:
                   app: {{ template "redis-ha.name" . }}-haproxy
                   release: {{ .Release.Name }}
+                  component: haproxy
               topologyKey: kubernetes.io/hostname
     {{- else }}
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -86,6 +90,7 @@ spec:
                   matchLabels:
                     app: {{ template "redis-ha.name" . }}-haproxy
                     release: {{ .Release.Name }}
+                    component: haproxy
                 topologyKey: kubernetes.io/hostname
     {{- end }}
     {{- end }}
@@ -98,6 +103,7 @@ spec:
           matchLabels:
             app: {{ template "redis-ha.name" . }}-haproxy
             release: {{ .Release.Name }}
+            component: haproxy
       {{- end }}
       initContainers:
       - name: config-init

charts/redis-ha/templates/redis-haproxy-network-policy.yaml

@@ -21,6 +21,7 @@ spec:
     matchLabels:
       release: {{ .Release.Name }}
       app: {{ template "redis-ha.name" . }}-haproxy
+      component: haproxy
   policyTypes:
     - Ingress
     - Egress

charts/redis-ha/templates/redis-haproxy-pdb.yaml

@@ -14,5 +14,6 @@ spec:
     matchLabels:
       release: {{ .Release.Name }}
       app: {{ template "redis-ha.name" . }}-haproxy
+      component: haproxy
 {{ toYaml .Values.haproxy.podDisruptionBudget | indent 2 }}
 {{- end -}}

charts/redis-ha/templates/redis-haproxy-role.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "labels.standard" . | indent 4 }}
-    component: {{ template "redis-ha.fullname" . }}-haproxy
+    component: haproxy
     {{- range $key, $value := .Values.extraLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}

charts/redis-ha/templates/redis-haproxy-rolebinding.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "labels.standard" . | indent 4 }}
-    component: {{ template "redis-ha.fullname" . }}-haproxy
+    component: haproxy
     {{- range $key, $value := .Values.extraLabels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}

charts/redis-ha/templates/redis-haproxy-service.yaml

@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "labels.standard" . | indent 4 }}
-    component: {{ template "redis-ha.fullname" . }}-haproxy
+    component: haproxy
 {{- range $key, $value := .Values.extraLabels }}
     {{ $key }}: {{ $value | quote }}
 {{- end }}

charts/redis-ha/templates/redis-haproxy-servicemonitor.yaml

@@ -35,5 +35,5 @@ spec:
     matchLabels:
       app: {{ template "redis-ha.name" . }}
       release: {{ .Release.Name }}
-      component: {{ template "redis-ha.fullname" . }}-haproxy
+      component: haproxy
 {{- end }}

charts/redis-ha/values.yaml

@@ -645,6 +645,10 @@ containerSecurityContext:
 # -- Node labels for pod assignment
 nodeSelector: {}
 
+## -- Tolerations for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+
 # -- Whether the Redis server pods should be forced to run on separate nodes.
 ## This is accomplished by setting their AntiAffinity with requiredDuringSchedulingIgnoredDuringExecution as opposed to preferred.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#inter-pod-affinity-and-anti-affinity-beta-feature