From 56a96ca2a7cfe3865b4c1a62882197abacda3859 Mon Sep 17 00:00:00 2001 From: Michael Gysel Date: Fri, 18 Oct 2024 08:57:40 +0200 Subject: [PATCH 1/2] Add label, annotation, and priorityClassName to operator chart values Signed-off-by: Michael Gysel --- ...nsearch-operator-controller-manager-deployment.yaml | 10 ++++++++++ charts/opensearch-operator/values.yaml | 3 +++ 2 files changed, 13 insertions(+) diff --git a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml index 08f089f44..151ca33fb 100755 --- a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml +++ b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml @@ -13,6 +13,13 @@ spec: metadata: labels: control-plane: controller-manager + {{- with .Values.labels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.annotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} spec: containers: {{- if or (.Values.kubeRbacProxy.enable) (eq (.Values.kubeRbacProxy.enable | toString) "") }} @@ -82,3 +89,6 @@ spec: {{- end }} serviceAccountName: {{ include "opensearch-operator.serviceAccountName" . }} terminationGracePeriodSeconds: 10 + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName }} + {{- end }} diff --git a/charts/opensearch-operator/values.yaml b/charts/opensearch-operator/values.yaml index 0629f2617..edc67bcc2 100644 --- a/charts/opensearch-operator/values.yaml +++ b/charts/opensearch-operator/values.yaml @@ -1,10 +1,13 @@ nameOverride: "" fullnameOverride: "" +annotations: {} +labels: {} nodeSelector: {} tolerations: [] securityContext: runAsNonRoot: true +priorityClassName: "" manager: securityContext: allowPrivilegeEscalation: false From f0735b4d99683b76fa2400cd23cd2852d2f43dba Mon Sep 17 00:00:00 2001 From: Michael Gysel Date: Fri, 18 Oct 2024 15:36:54 +0200 Subject: [PATCH 2/2] Rename annotations to podAnnotations and labels to podLabels Signed-off-by: Michael Gysel --- .../opensearch-operator-controller-manager-deployment.yaml | 4 ++-- charts/opensearch-operator/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml index 151ca33fb..4b5cb194b 100755 --- a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml +++ b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml @@ -13,10 +13,10 @@ spec: metadata: labels: control-plane: controller-manager - {{- with .Values.labels }} + {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.annotations }} + {{- with .Values.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/opensearch-operator/values.yaml b/charts/opensearch-operator/values.yaml index edc67bcc2..d2b2ac613 100644 --- a/charts/opensearch-operator/values.yaml +++ b/charts/opensearch-operator/values.yaml @@ -1,8 +1,8 @@ nameOverride: "" fullnameOverride: "" -annotations: {} -labels: {} +podAnnotations: {} +podLabels: {} nodeSelector: {} tolerations: [] securityContext: