Skip to content

Commit 81a64c3

Browse files
authored
Revert "feat(helm): adds common label support to the helm chart (#6042)" (#6077)
This reverts commit 2249e59. Reason: broken tests
1 parent 2249e59 commit 81a64c3

File tree

7 files changed

+0
-126
lines changed

7 files changed

+0
-126
lines changed

contrib/charts/dragonfly/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ helm upgrade --install dragonfly oci://ghcr.io/dragonflydb/dragonfly/helm/dragon
3232
|-----|------|---------|-------------|
3333
| affinity | object | `{}` | Affinity for pod assignment |
3434
| command | list | `[]` | Allow overriding the container's command |
35-
| commonLabels | object | `{}` | Common labels to add to all K8s resources |
3635
| extraArgs | list | `[]` | Extra arguments to pass to the dragonfly binary |
3736
| extraContainers | list | `[]` | Additional sidecar containers |
3837
| extraObjects | list | `[]` | extra K8s manifests to deploy |

contrib/charts/dragonfly/ci/commonlabels-values.golden.yaml

Lines changed: 0 additions & 101 deletions
This file was deleted.

contrib/charts/dragonfly/ci/commonlabels-values.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

contrib/charts/dragonfly/templates/_helpers.tpl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,6 @@ helm.sh/chart: {{ include "dragonfly.chart" . }}
4040
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4141
{{- end }}
4242
app.kubernetes.io/managed-by: {{ .Release.Service }}
43-
{{- include "dragonfly.commonLabels" . }}
44-
{{- end }}
45-
46-
{{/*
47-
User-defined common labels
48-
*/}}
49-
{{- define "dragonfly.commonLabels" -}}
50-
{{- if .Values.commonLabels }}
51-
{{- range $key, $value := .Values.commonLabels }}
52-
{{ $key }}: {{ $value }}
53-
{{- end }}
54-
{{- end }}
5543
{{- end }}
5644

5745
{{/*

contrib/charts/dragonfly/templates/deployment.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ spec:
2222
{{- end }}
2323
labels:
2424
{{- include "dragonfly.selectorLabels" . | nindent 8 }}
25-
{{- if .Values.commonLabels }}
26-
{{- include "dragonfly.commonLabels" . | trim | nindent 8 }}
27-
{{- end }}
2825
spec:
2926
{{- include "dragonfly.pod" . | trim | nindent 6 }}
3027
{{- end }}

contrib/charts/dragonfly/templates/statefulset.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ spec:
2323
{{- end }}
2424
labels:
2525
{{- include "dragonfly.selectorLabels" . | nindent 8 }}
26-
{{- if .Values.commonLabels }}
27-
{{- include "dragonfly.commonLabels" . | trim | nindent 8 }}
28-
{{- end }}
2926
spec:
3027
{{- include "dragonfly.pod" . | trim | nindent 6 }}
3128
volumeClaimTemplates:

contrib/charts/dragonfly/values.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ nameOverride: ""
2222
# -- String to fully override dragonfly.fullname
2323
fullnameOverride: ""
2424

25-
# -- Common labels to add to all resources
26-
commonLabels: {}
27-
2825
serviceAccount:
2926
# -- Specifies whether a service account should be created
3027
create: true

0 commit comments

Comments
 (0)