From ee50ef74be87fb5afe14abb90d81e03c5d8b1c8b Mon Sep 17 00:00:00 2001 From: Thibault Cohen Date: Wed, 26 Feb 2020 17:43:19 -0500 Subject: [PATCH] [Weave Scope] Add priorityClassName for DaemonSet (#20893) Signed-off-by: Thibault Cohen --- stable/weave-scope/Chart.yaml | 2 +- stable/weave-scope/README.md | 1 + stable/weave-scope/charts/weave-scope-agent/Chart.yaml | 2 +- .../charts/weave-scope-agent/templates/daemonset.yaml | 3 +++ stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml | 2 +- stable/weave-scope/charts/weave-scope-frontend/Chart.yaml | 2 +- stable/weave-scope/values.yaml | 1 + 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/stable/weave-scope/Chart.yaml b/stable/weave-scope/Chart.yaml index 713f6416b5..7772757e0e 100644 --- a/stable/weave-scope/Chart.yaml +++ b/stable/weave-scope/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: weave-scope -version: 1.1.8 +version: 1.1.9 appVersion: 1.12.0 description: A Helm chart for the Weave Scope cluster visualizer. keywords: diff --git a/stable/weave-scope/README.md b/stable/weave-scope/README.md index 6e7101d5a9..075eca3eec 100644 --- a/stable/weave-scope/README.md +++ b/stable/weave-scope/README.md @@ -87,6 +87,7 @@ The **agent** section controls how the Weave Scope node agent pods are installed | **dockerBridge** | the name of the Docker bridge interface | `docker0` | | **scopeFrontendAddr** | the host:port of a Scope frontend to send data to -- this is only needed in cases where the frontend is deployed separately from the agent (e.g. an install outside the cluster or a pre-existing install inside it) | | | **probeToken** | the token used to connect to Weave Cloud -- this is not needed for connecting to non-cloud Scope frontends | | +| **priorityClassName** | The priorityClassName used for the Daemonset | | | **readOnly** | disables all controls (e.g. start/stop, terminal, logs, etc.) | `false` | | **resources.*** | controls requests/limits for the agent (these values are all optional) | | | **resources.requests.cpu** | CPU request in MHz (m) | | diff --git a/stable/weave-scope/charts/weave-scope-agent/Chart.yaml b/stable/weave-scope/charts/weave-scope-agent/Chart.yaml index 77d69f36c1..de68cb1800 100644 --- a/stable/weave-scope/charts/weave-scope-agent/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-agent/Chart.yaml @@ -1,6 +1,6 @@ description: A Helm chart for the Weave Scope cluster visualizer node agent. name: weave-scope-agent -version: 1.1.8 +version: 1.1.9 appVersion: 1.12.0 keywords: - containers diff --git a/stable/weave-scope/charts/weave-scope-agent/templates/daemonset.yaml b/stable/weave-scope/charts/weave-scope-agent/templates/daemonset.yaml index 4d5036af2b..d2ebbf64a1 100644 --- a/stable/weave-scope/charts/weave-scope-agent/templates/daemonset.yaml +++ b/stable/weave-scope/charts/weave-scope-agent/templates/daemonset.yaml @@ -25,6 +25,9 @@ spec: tolerations: - effect: NoSchedule operator: Exists + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName }} + {{- end }} containers: - name: {{ template "weave-scope-agent.name" . }} image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag }}" diff --git a/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml b/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml index ca7ce02b9c..77fb40e4cf 100644 --- a/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml @@ -1,6 +1,6 @@ description: A Helm chart for the Weave Scope cluster visualizer node agent. name: weave-scope-cluster-agent -version: 1.1.8 +version: 1.1.9 appVersion: 1.12.0 keywords: - containers diff --git a/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml b/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml index 715296a715..86eefee0e6 100644 --- a/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml @@ -1,6 +1,6 @@ description: A Helm chart for the Weave Scope cluster visualizer frontend. name: weave-scope-frontend -version: 1.1.8 +version: 1.1.9 appVersion: 1.12.0 keywords: - containers diff --git a/stable/weave-scope/values.yaml b/stable/weave-scope/values.yaml index 9b7b8d7b4d..64f3a3561c 100644 --- a/stable/weave-scope/values.yaml +++ b/stable/weave-scope/values.yaml @@ -60,6 +60,7 @@ weave-scope-frontend: weave-scope-agent: enabled: true flags: [] + # priorityClassName: # weave-scope-agent.dockerBridge: (required if agent.enabled == true) the name of the Docker bridge interface dockerBridge: "docker0" # weave-scope-agent.scopeFrontendAddr: the host:port of a Scope frontend to send data to