Skip to content

Commit

Permalink
fix(helm-charts): streamline new value for activating the priority cl…
Browse files Browse the repository at this point in the history 
…ass for node-critical pods

Signed-off-by: Florian Fürstenberg <[email protected]>
  • Loading branch information
@ffuerste @klihub
ffuerste authored and klihub committed Jan 10, 2024
1 parent 151e458 commit fcef94b
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 36 deletions.
2 changes: 1 addition & 1 deletion deployment/helm/balloons/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ customize with their own values, along with the default values.
| `hostPort` | 8891 | metrics port to expose on the host |
| `config` | see [helm chart values](tree:/deployment/helm/balloons/values.yaml) for the default configuration | plugin configuration data |
| `nri.patchRuntimeConfig` | false | enable NRI in containerd or CRI-O |
| `nri.setPodPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
| `initImage.name` | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager) | init container image name |
| `initImage.tag` | unstable | init container image tag |
| `initImage.pullPolicy` | Always | init container image pull policy |
| `tolerations` | [] | specify taint toleration key, operator and effect |
| `affinity` | [] | specify node affinity |
| `nodeSelector` | [] | specify node selector labels |
| `podPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
2 changes: 1 addition & 1 deletion deployment/helm/balloons/templates/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ spec:
mountPath: /var/run/nri-resource-policy
- name: nrisockets
mountPath: /var/run/nri
{{- if .Values.nri.setPodPriorityClassNodeCritical }}
{{- if .Values.podPriorityClassNodeCritical }}
priorityClassName: system-node-critical
{{- end }}
volumes:
Expand Down
9 changes: 5 additions & 4 deletions deployment/helm/balloons/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ resources:

nri:
patchRuntimeConfig: false
# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
setPodPriorityClassNodeCritical: false

initContainerImage:
name: ghcr.io/containers/nri-plugins/nri-config-manager
Expand Down Expand Up @@ -82,3 +78,8 @@ nodeSelector: []
#
# nodeSelector:
# kubernetes.io/disk: "ssd"

# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
podPriorityClassNodeCritical: false
2 changes: 1 addition & 1 deletion deployment/helm/memory-qos/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ customize with their own values, along with the default values.
| `resources.cpu` | 10m | cpu resources for the Pod |
| `resources.memory` | 100Mi | memory qouta for the Pod |
| `nri.patchRuntimeConfig` | false | enable NRI in containerd or CRI-O |
| `nri.setPodPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
| `initImage.name` | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager) | init container image name |
| `initImage.tag` | unstable | init container image tag |
| `initImage.pullPolicy` | Always | init container image pull policy |
| `tolerations` | [] | specify taint toleration key, operator and effect |
| `affinity` | [] | specify node affinity |
| `nodeSelector` | [] | specify node selector labels |
| `podPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
2 changes: 1 addition & 1 deletion deployment/helm/memory-qos/templates/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
mountPath: /etc/nri/memory-qos
- name: nrisockets
mountPath: /var/run/nri
{{- if .Values.nri.setPodPriorityClassNodeCritical }}
{{- if .Values.podPriorityClassNodeCritical }}
priorityClassName: system-node-critical
{{- end }}
volumes:
Expand Down
9 changes: 5 additions & 4 deletions deployment/helm/memory-qos/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ resources:

nri:
patchRuntimeConfig: false
# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
setPodPriorityClassNodeCritical: false

initContainerImage:
name: ghcr.io/containers/nri-plugins/nri-config-manager
Expand Down Expand Up @@ -54,3 +50,8 @@ nodeSelector: []
#
# nodeSelector:
# kubernetes.io/disk: "ssd"

# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
podPriorityClassNodeCritical: false
2 changes: 1 addition & 1 deletion deployment/helm/memtierd/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ customize with their own values, along with the default values.
| `resources.memory` | 100Mi | memory qouta for the Pod |
| `outputDir` | empty string | host directory for memtierd.output files |
| `nri.patchRuntimeConfig` | false | enable NRI in containerd or CRI-O |
| `nri.setPodPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
| `initImage.name` | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager) | init container image name |
| `initImage.tag` | unstable | init container image tag |
| `initImage.pullPolicy` | Always | init container image pull policy |
| `tolerations` | [] | specify taint toleration key, operator and effect |
| `affinity` | [] | specify node affinity |
| `nodeSelector` | [] | specify node selector labels |
| `podPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
2 changes: 1 addition & 1 deletion deployment/helm/memtierd/templates/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
- name: run-dir-vol
mountPath: /run-dir
{{- end }}
{{- if .Values.nri.setPodPriorityClassNodeCritical }}
{{- if .Values.podPriorityClassNodeCritical }}
priorityClassName: system-node-critical
{{- end }}
volumes:
Expand Down
9 changes: 5 additions & 4 deletions deployment/helm/memtierd/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ outputDir: ""

nri:
patchRuntimeConfig: false
# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
setPodPriorityClassNodeCritical: false

initContainerImage:
name: ghcr.io/containers/nri-plugins/nri-config-manager
Expand Down Expand Up @@ -56,3 +52,8 @@ nodeSelector: []
#
# nodeSelector:
# kubernetes.io/disk: "ssd"

# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
podPriorityClassNodeCritical: false
2 changes: 1 addition & 1 deletion deployment/helm/sgx-epc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ customize with their own values, along with the default values.
| `resources.cpu` | 25m | cpu resources for the Pod |
| `resources.memory` | 100Mi | memory qouta for the Pod |
| `nri.patchRuntimeConfig` | false | enable NRI in containerd or CRI-O |
| `nri.setPodPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
| `initImage.name` | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager) |
| init container image name |
| `initImage.tag` | unstable | init container image tag |
| `initImage.pullPolicy` | Always | init container image pull policy |
| `tolerations` | [] | specify taint toleration key, operator and effect |
| `affinity` | [] | specify node affinity |
| `nodeSelector` | [] | specify node selector labels |
| `podPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
2 changes: 1 addition & 1 deletion deployment/helm/sgx-epc/templates/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
volumeMounts:
- name: nrisockets
mountPath: /var/run/nri
{{- if .Values.nri.setPodPriorityClassNodeCritical }}
{{- if .Values.podPriorityClassNodeCritical }}
priorityClassName: system-node-critical
{{- end }}
volumes:
Expand Down
9 changes: 5 additions & 4 deletions deployment/helm/sgx-epc/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ resources:

nri:
patchRuntimeConfig: false
# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
setPodPriorityClassNodeCritical: false

initContainerImage:
name: ghcr.io/containers/nri-plugins/nri-config-manager
Expand Down Expand Up @@ -54,3 +50,8 @@ nodeSelector: []
#
# nodeSelector:
# kubernetes.io/disk: "ssd"

# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
podPriorityClassNodeCritical: false
2 changes: 1 addition & 1 deletion deployment/helm/template/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ customize with their own values, along with the default values.
| `hostPort` | 8891 | metrics port to expose on the host |
| `config` | see [helm chart values](tree:/deployment/helm/template/values.yaml) for the default configuration | plugin configuration data |
| `nri.patchRuntimeConfig` | false | enable NRI in containerd or CRI-O |
| `nri.setPodPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
| `initImage.name` | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager) | init container image name |
| `initImage.tag` | unstable | init container image tag |
| `initImage.pullPolicy` | Always | init container image pull policy |
| `tolerations` | [] | specify taint toleration key, operator and effect |
| `podPriorityClassNodeCritical` | false | enable [marking Pod as node critical](https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/#marking-pod-as-critical) |
2 changes: 1 addition & 1 deletion deployment/helm/template/templates/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
mountPath: /var/run/nri-resource-policy
- name: nrisockets
mountPath: /var/run/nri
{{- if .Values.nri.setPodPriorityClassNodeCritical }}
{{- if .Values.podPriorityClassNodeCritical }}
priorityClassName: system-node-critical
{{- end }}
volumes:
Expand Down
9 changes: 5 additions & 4 deletions deployment/helm/template/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ resources:

nri:
patchRuntimeConfig: false
# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
setPodPriorityClassNodeCritical: false

initContainerImage:
name: ghcr.io/containers/nri-plugins/nri-config-manager
Expand All @@ -49,3 +45,8 @@ tolerations: []
# - key: "node-role.kubernetes.io/control-plane"
# operator: "Exists"
# effect: "NoSchedule"

# NRI plugins should be considered as part of the container runtime.
# Therefore, adding the system-node-critical priority class to the DaemonSet,
# could mitigate potential risk in a running system under load.
podPriorityClassNodeCritical: false
Loading

0 comments on commit fcef94b

Please sign in to comment.