From 6891fdb5742f18af72df5d1a48c7f68bd2cccbee Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Fri, 26 Jan 2024 15:22:04 +0100
Subject: [PATCH 1/2] feat(helm): support labels in values.yaml

---
 CHANGELOG.md                                          | 5 +++++
 deploy/helm/spark-k8s-operator/templates/_helpers.tpl | 3 +++
 deploy/helm/spark-k8s-operator/values.yaml            | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f55b6a4..91ae7389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- Helm: support labels in values.yaml ([#344]).
+
 ### Changed
 
 - Various documentation of the CRD ([#319]).
@@ -17,6 +21,7 @@ All notable changes to this project will be documented in this file.
 
 [#313]: https://github.com/stackabletech/spark-k8s-operator/pull/313
 [#319]: https://github.com/stackabletech/spark-k8s-operator/pull/319
+[#344]: https://github.com/stackabletech/spark-k8s-operator/pull/344
 
 ## [23.11.0] - 2023-11-24
 
diff --git a/deploy/helm/spark-k8s-operator/templates/_helpers.tpl b/deploy/helm/spark-k8s-operator/templates/_helpers.tpl
index a2258b27..1096ffc6 100644
--- a/deploy/helm/spark-k8s-operator/templates/_helpers.tpl
+++ b/deploy/helm/spark-k8s-operator/templates/_helpers.tpl
@@ -55,6 +55,9 @@ Selector labels
 {{- define "operator.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "operator.appname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- with .Values.labels }}
+{{ toYaml . }}
+{{- end }}
 {{- end }}
 
 {{/*
diff --git a/deploy/helm/spark-k8s-operator/values.yaml b/deploy/helm/spark-k8s-operator/values.yaml
index 18909e71..29d51e72 100644
--- a/deploy/helm/spark-k8s-operator/values.yaml
+++ b/deploy/helm/spark-k8s-operator/values.yaml
@@ -3,8 +3,8 @@
 image:
   repository: docker.stackable.tech/stackable/spark-k8s-operator
   pullPolicy: IfNotPresent
+  pullSecrets: []
 
-imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
@@ -19,6 +19,9 @@ serviceAccount:
 
 podAnnotations: {}
 
+# Provide additional labels which get attached to all deployed resources
+labels: {}
+
 podSecurityContext: {}
   # fsGroup: 2000
 

From e1cbff4b92690a2053519fa3dd9c8a24f32423bc Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Mon, 29 Jan 2024 12:49:36 +0100
Subject: [PATCH 2/2] fix(helm): add missing labels to roles

---
 deploy/helm/spark-k8s-operator/templates/roles.yaml           | 2 ++
 .../helm/spark-k8s-operator/templates/spark-clusterrole.yaml  | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/deploy/helm/spark-k8s-operator/templates/roles.yaml b/deploy/helm/spark-k8s-operator/templates/roles.yaml
index df6471b3..968e0180 100644
--- a/deploy/helm/spark-k8s-operator/templates/roles.yaml
+++ b/deploy/helm/spark-k8s-operator/templates/roles.yaml
@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "operator.fullname" . }}-clusterrole
+  labels:
+  {{- include "operator.labels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ""
diff --git a/deploy/helm/spark-k8s-operator/templates/spark-clusterrole.yaml b/deploy/helm/spark-k8s-operator/templates/spark-clusterrole.yaml
index e3f0daef..4209b29e 100644
--- a/deploy/helm/spark-k8s-operator/templates/spark-clusterrole.yaml
+++ b/deploy/helm/spark-k8s-operator/templates/spark-clusterrole.yaml
@@ -4,6 +4,8 @@ apiVersion: security.openshift.io/v1
 kind: SecurityContextConstraints
 metadata:
   name: spark-k8s-scc
+  labels:
+  {{- include "operator.labels" . | nindent 4 }}
   annotations:
     kubernetes.io/description: |-
       This resource is derived from hostmount-anyuid. It provides all the features of the
@@ -47,6 +49,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "operator.name" . }}-clusterrole
+  labels:
+  {{- include "operator.labels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ""