Merge pull request #4222 from harshagv/priority-configmap-annotation

allow adding annotations for priority-expander configmap
kubernetes · Aug 6, 2021 · d86a875 · d86a875
2 parents ca49c2c + 2dd92cb
commit d86a875
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml
@@ -17,4 +17,4 @@ name: cluster-autoscaler
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
-version: 9.10.3
+version: 9.10.4
diff --git a/charts/cluster-autoscaler/README.md b/charts/cluster-autoscaler/README.md
@@ -383,6 +383,7 @@ Though enough for the majority of installations, the default PodSecurityPolicy _
 | podDisruptionBudget | object | `{"maxUnavailable":1}` | Pod disruption budget. |
 | podLabels | object | `{}` | Labels to add to each pod. |
 | priorityClassName | string | `""` | priorityClassName |
+| priorityConfigMapAnnotations | object | `{}` | Annotations to add to `cluster-autoscaler-priority-expander` ConfigMap. |
 | prometheusRule.additionalLabels | object | `{}` | Additional labels to be set in metadata. |
 | prometheusRule.enabled | bool | `false` | If true, creates a Prometheus Operator PrometheusRule. |
 | prometheusRule.interval | string | `nil` | How often rules in the group are evaluated (falls back to `global.evaluation_interval` if not set). |

diff --git a/charts/cluster-autoscaler/templates/priority-expander-configmap.yaml b/charts/cluster-autoscaler/templates/priority-expander-configmap.yaml
@@ -6,6 +6,10 @@ metadata:
   name: cluster-autoscaler-priority-expander
   labels:
 {{ include "cluster-autoscaler.labels" . | indent 4 }}
+  {{- if .Values.priorityConfigMapAnnotations }}
+  annotations:
+{{ toYaml .Values.priorityConfigMapAnnotations | indent 4 }}
+  {{- end }}
 data:
   priorities: |-
 {{ .Values.expanderPriorities | indent 4 }}

diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
@@ -125,6 +125,11 @@ dnsPolicy: ClusterFirst
 # See: https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/expander/priority/readme.md
 expanderPriorities: {}
 
+# priorityConfigMapAnnotations -- Annotations to add to `cluster-autoscaler-priority-expander` ConfigMap.
+priorityConfigMapAnnotations: {}
+  # key1: "value1"
+  # key2: "value2"
+
 # extraArgs -- Additional container arguments.
 # Refer to https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-the-parameters-to-ca for the full list of cluster autoscaler
 # parameters and their default values.