From 49e21c389bdb796ef9ffbc0080bf9e173683eddd Mon Sep 17 00:00:00 2001 From: kfox1111 Date: Mon, 5 Feb 2024 12:33:24 -0800 Subject: [PATCH] Add missing affinity settings (#232) Signed-off-by: Kevin Fox Co-authored-by: Faisal Memon --- charts/spire/charts/spiffe-csi-driver/README.md | 1 + .../spire/charts/spiffe-csi-driver/templates/daemonset.yaml | 4 ++++ charts/spire/charts/spiffe-csi-driver/values.yaml | 3 +++ charts/spire/charts/spire-agent/README.md | 1 + charts/spire/charts/spire-agent/templates/daemonset.yaml | 4 ++++ charts/spire/charts/spire-agent/values.yaml | 3 +++ 6 files changed, 16 insertions(+) diff --git a/charts/spire/charts/spiffe-csi-driver/README.md b/charts/spire/charts/spiffe-csi-driver/README.md index cfcb628..92322dd 100644 --- a/charts/spire/charts/spiffe-csi-driver/README.md +++ b/charts/spire/charts/spiffe-csi-driver/README.md @@ -51,6 +51,7 @@ A Helm chart to install the SPIFFE CSI driver. | `securityContext.privileged` | Flag for specifying privileged mode | `true` | | `nodeSelector` | Node selector for CSI driver pods | `{}` | | `tolerations` | Tolerations for CSI driver pods | `[]` | +| `affinity` | Node affinity | `{}` | | `nodeDriverRegistrar.image.registry` | The OCI registry to pull the image from | `registry.k8s.io` | | `nodeDriverRegistrar.image.repository` | The repository within the registry | `sig-storage/csi-node-driver-registrar` | | `nodeDriverRegistrar.image.pullPolicy` | The image pull policy | `IfNotPresent` | diff --git a/charts/spire/charts/spiffe-csi-driver/templates/daemonset.yaml b/charts/spire/charts/spiffe-csi-driver/templates/daemonset.yaml index f818040..3044ac4 100644 --- a/charts/spire/charts/spiffe-csi-driver/templates/daemonset.yaml +++ b/charts/spire/charts/spiffe-csi-driver/templates/daemonset.yaml @@ -29,6 +29,10 @@ spec: nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} diff --git a/charts/spire/charts/spiffe-csi-driver/values.yaml b/charts/spire/charts/spiffe-csi-driver/values.yaml index 8eebf6f..4f1afaf 100644 --- a/charts/spire/charts/spiffe-csi-driver/values.yaml +++ b/charts/spire/charts/spiffe-csi-driver/values.yaml @@ -96,6 +96,9 @@ nodeSelector: {} ## @param tolerations [array] Tolerations for CSI driver pods tolerations: [] +## @param affinity [object] Node affinity +affinity: {} + nodeDriverRegistrar: ## @param nodeDriverRegistrar.image.registry The OCI registry to pull the image from ## @param nodeDriverRegistrar.image.repository The repository within the registry diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md index 22c11c4..c059bcf 100644 --- a/charts/spire/charts/spire-agent/README.md +++ b/charts/spire/charts/spire-agent/README.md @@ -45,6 +45,7 @@ A Helm chart to install the SPIRE agent. | `resources` | Resource requests and limits | `{}` | | `nodeSelector` | Node selector | `{}` | | `tolerations` | List of tolerations | `[]` | +| `affinity` | Node affinity | `{}` | | `logLevel` | The log level, valid values are "debug", "info", "warn", and "error" | `info` | | `clusterName` | The name of the Kubernetes cluster (`kubeadm init --service-dns-domain`) | `example-cluster` | | `trustDomain` | The trust domain to be used for the SPIFFE identifiers | `example.org` | diff --git a/charts/spire/charts/spire-agent/templates/daemonset.yaml b/charts/spire/charts/spire-agent/templates/daemonset.yaml index 7dfe8d0..279f56c 100644 --- a/charts/spire/charts/spire-agent/templates/daemonset.yaml +++ b/charts/spire/charts/spire-agent/templates/daemonset.yaml @@ -158,6 +158,10 @@ spec: nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} diff --git a/charts/spire/charts/spire-agent/values.yaml b/charts/spire/charts/spire-agent/values.yaml index f072b52..b2be153 100644 --- a/charts/spire/charts/spire-agent/values.yaml +++ b/charts/spire/charts/spire-agent/values.yaml @@ -77,6 +77,9 @@ nodeSelector: {} ## @param tolerations [array] List of tolerations tolerations: [] +## @param affinity [object] Node affinity +affinity: {} + ## @param logLevel The log level, valid values are "debug", "info", "warn", and "error" logLevel: info ## @param clusterName The name of the Kubernetes cluster (`kubeadm init --service-dns-domain`)