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/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: - "" 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