From 091729a8d8b43e85a53288fd257a2de606cfdba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20M=2E=20Cust=C3=B3dio?= Date: Tue, 25 Feb 2020 22:02:27 +0000 Subject: [PATCH] [stable/etcd-operator] Allow for setting priority classes. (#20761) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bruno Miguel Custódio --- stable/etcd-operator/Chart.yaml | 2 +- stable/etcd-operator/README.md | 3 +++ stable/etcd-operator/templates/backup-operator-deployment.yaml | 3 +++ stable/etcd-operator/templates/operator-deployment.yaml | 3 +++ .../etcd-operator/templates/restore-operator-deployment.yaml | 3 +++ stable/etcd-operator/values.yaml | 3 +++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/stable/etcd-operator/Chart.yaml b/stable/etcd-operator/Chart.yaml index b34ae806cf..b44e37292f 100755 --- a/stable/etcd-operator/Chart.yaml +++ b/stable/etcd-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: CoreOS etcd-operator Helm chart for Kubernetes name: etcd-operator -version: 0.10.2 +version: 0.10.3 appVersion: 0.9.4 home: https://github.com/coreos/etcd-operator icon: https://raw.githubusercontent.com/coreos/etcd/master/logos/etcd-horizontal-color.png diff --git a/stable/etcd-operator/README.md b/stable/etcd-operator/README.md index 417b19b4a1..da6532e000 100644 --- a/stable/etcd-operator/README.md +++ b/stable/etcd-operator/README.md @@ -80,6 +80,7 @@ The following table lists the configurable parameters of the etcd-operator chart | `etcdOperator.nodeSelector` | Node labels for etcd operator pod assignment | `{}` | | `etcdOperator.podAnnotations` | Annotations for the etcd operator pod | `{}` | | `etcdOperator.commandArgs` | Additional command arguments | `{}` | +| `etcdOperator.priorityClassName` | Priority class for the etcd-operator pod(s) | `""` | | `backupOperator.name` | Backup operator name | `etcd-backup-operator` | | `backupOperator.replicaCount` | Number of operator replicas to create (only 1 is supported) | `1` | | `backupOperator.image.repository` | Operator container image | `quay.io/coreos/etcd-operator` | @@ -93,6 +94,7 @@ The following table lists the configurable parameters of the etcd-operator chart | `backupOperator.spec.s3.awsSecret` | Name of kubernetes secret containing aws credentials | | | `backupOperator.nodeSelector` | Node labels for etcd operator pod assignment | `{}` | | `backupOperator.commandArgs` | Additional command arguments | `{}` | +| `backupOperator.priorityClassName` | Priority class for the etcd-backuop-operator pod(s) | `""` | | `restoreOperator.name` | Restore operator name | `etcd-backup-operator` | | `restoreOperator.replicaCount` | Number of operator replicas to create (only 1 is supported) | `1` | | `restoreOperator.image.repository` | Operator container image | `quay.io/coreos/etcd-operator` | @@ -105,6 +107,7 @@ The following table lists the configurable parameters of the etcd-operator chart | `restoreOperator.spec.s3.awsSecret` | Name of kubernetes secret containing aws credentials | | | `restoreOperator.nodeSelector` | Node labels for etcd operator pod assignment | `{}` | | `restoreOperator.commandArgs` | Additional command arguments | `{}` | +| `restoreOperator.priorityClassName` | Priority class for the etcd-restore-operator pod(s) | `""` | | `etcdCluster.name` | etcd cluster name | `etcd-cluster` | | `etcdCluster.size` | etcd cluster size | `3` | | `etcdCluster.version` | etcd cluster version | `3.2.25` | diff --git a/stable/etcd-operator/templates/backup-operator-deployment.yaml b/stable/etcd-operator/templates/backup-operator-deployment.yaml index 8b8d51b00d..d1068c7721 100644 --- a/stable/etcd-operator/templates/backup-operator-deployment.yaml +++ b/stable/etcd-operator/templates/backup-operator-deployment.yaml @@ -22,6 +22,9 @@ spec: app: {{ template "etcd-backup-operator.fullname" . }} release: {{ .Release.Name }} spec: + {{- if .Values.backupOperator.priorityClassName }} + priorityClassName: {{ .Values.backupOperator.priorityClassName }} + {{- end }} serviceAccountName: {{ template "etcd-operator.serviceAccountName" . }} containers: - name: {{ .Values.backupOperator.name }} diff --git a/stable/etcd-operator/templates/operator-deployment.yaml b/stable/etcd-operator/templates/operator-deployment.yaml index dc50d46ec0..26bf33ad5a 100644 --- a/stable/etcd-operator/templates/operator-deployment.yaml +++ b/stable/etcd-operator/templates/operator-deployment.yaml @@ -23,6 +23,9 @@ spec: release: {{ .Release.Name }} annotations: {{ toYaml .Values.etcdOperator.podAnnotations | nindent 8}} spec: + {{- if .Values.etcdOperator.priorityClassName }} + priorityClassName: {{ .Values.etcdOperator.priorityClassName }} + {{- end }} serviceAccountName: {{ template "etcd-operator.serviceAccountName" . }} containers: - name: {{ template "etcd-operator.fullname" . }} diff --git a/stable/etcd-operator/templates/restore-operator-deployment.yaml b/stable/etcd-operator/templates/restore-operator-deployment.yaml index ce27f6f827..f1a2cd275a 100644 --- a/stable/etcd-operator/templates/restore-operator-deployment.yaml +++ b/stable/etcd-operator/templates/restore-operator-deployment.yaml @@ -22,6 +22,9 @@ spec: app: {{ template "etcd-restore-operator.name" . }} release: {{ .Release.Name }} spec: + {{- if .Values.restoreOperator.priorityClassName }} + priorityClassName: {{ .Values.restoreOperator.priorityClassName }} + {{- end }} serviceAccountName: {{ template "etcd-operator.serviceAccountName" . }} containers: - name: {{ .Values.restoreOperator.name }} diff --git a/stable/etcd-operator/values.yaml b/stable/etcd-operator/values.yaml index 242ba0bd0f..148635e2cb 100644 --- a/stable/etcd-operator/values.yaml +++ b/stable/etcd-operator/values.yaml @@ -38,6 +38,7 @@ customResources: # etcdOperator etcdOperator: + priorityClassName: "" name: etcd-operator replicaCount: 1 image: @@ -72,6 +73,7 @@ etcdOperator: # backup spec backupOperator: + priorityClassName: "" name: etcd-backup-operator replicaCount: 1 image: @@ -97,6 +99,7 @@ backupOperator: # restore spec restoreOperator: + priorityClassName: "" name: etcd-restore-operator replicaCount: 1 image: