This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-release.git
The following commit(s) were added to refs/heads/master by this push:
new 3cdef6d [YUNIKORN-1829] Allow helm chart to specify pod annotations
(#150)
3cdef6d is described below
commit 3cdef6d65dd050c6d6b87181d78098c06afef9dc
Author: Jacob Salway <[email protected]>
AuthorDate: Thu Jun 22 11:08:52 2023 -0500
[YUNIKORN-1829] Allow helm chart to specify pod annotations (#150)
Closes: #150
Signed-off-by: Craig Condit <[email protected]>
---
helm-charts/yunikorn/README.md | 2 ++
helm-charts/yunikorn/templates/admission-controller-deployment.yaml | 4 ++++
helm-charts/yunikorn/templates/deployment.yaml | 4 ++++
helm-charts/yunikorn/values.yaml | 2 ++
4 files changed, 12 insertions(+)
diff --git a/helm-charts/yunikorn/README.md b/helm-charts/yunikorn/README.md
index 4824d97..9156e76 100644
--- a/helm-charts/yunikorn/README.md
+++ b/helm-charts/yunikorn/README.md
@@ -73,7 +73,9 @@ The following table lists the configurable parameters of the
YuniKorn chart and
| `pluginImage.tag` | Scheduler plugin image tag
| `scheduler-plugin-latest` |
| `pluginImage.pullPolicy` | Scheduler plugin image
pull policy | `Always` |
| `podLabels` | Scheduler pod labels
| `{}` |
+| `podAnnotations` | Scheduler pod annotations
| `{}` |
| `admissionController.podLabels` | Admission controller pod
labels | `{}` |
+| `admissionController.podAnnotations` | Admission controller pod
annotations | `{}` |
| `admissionController.replicaCount` | Admission controller
replicas to be deployed | `1` |
| `admissionController.serviceAccount` | Admission controller
service account name | `yunikorn-admission-controller` |
| `admissionController.image.repository` | Admission controller image
repository | `apache/yunikorn` |
diff --git
a/helm-charts/yunikorn/templates/admission-controller-deployment.yaml
b/helm-charts/yunikorn/templates/admission-controller-deployment.yaml
index defc06d..6e08cce 100644
--- a/helm-charts/yunikorn/templates/admission-controller-deployment.yaml
+++ b/helm-charts/yunikorn/templates/admission-controller-deployment.yaml
@@ -46,6 +46,10 @@ spec:
{{- with .Values.admissionController.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
+ annotations:
+ {{- with .Values.admissionController.podAnnotations }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
spec:
{{- if .Values.admissionController.hostNetwork }}
hostNetwork: true
diff --git a/helm-charts/yunikorn/templates/deployment.yaml
b/helm-charts/yunikorn/templates/deployment.yaml
index fe0a30c..e819587 100644
--- a/helm-charts/yunikorn/templates/deployment.yaml
+++ b/helm-charts/yunikorn/templates/deployment.yaml
@@ -44,6 +44,10 @@ spec:
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
+ annotations:
+ {{- with .Values.podAnnotations }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
spec:
{{- if .Values.hostNetwork }}
hostNetwork: true
diff --git a/helm-charts/yunikorn/values.yaml b/helm-charts/yunikorn/values.yaml
index 573aa8a..c8f21f2 100644
--- a/helm-charts/yunikorn/values.yaml
+++ b/helm-charts/yunikorn/values.yaml
@@ -68,6 +68,7 @@ admissionController:
labelNamespaces: null # deprecated; use
admissionController.filtering.labelNamespaces in yunikornDefaults
noLabelNamespaces: null # deprecated; use
admissionController.filtering.noLabelNamespaces in yunikornDefaults
podLabels: {}
+ podAnnotations: {}
web:
image:
@@ -123,3 +124,4 @@ embedAdmissionController: true
enableSchedulerPlugin: false
podLabels: {}
+podAnnotations: {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
