From b8dfa6059538b32793e8f58fe55afb9ebbc2f10a Mon Sep 17 00:00:00 2001 From: Maksim Paskal Date: Tue, 10 Sep 2024 07:53:05 +0100 Subject: [PATCH] Use NFS server selectors (#124) Signed-off-by: Maksim Paskal --- Makefile | 4 ++-- scripts/chart/Chart.yaml | 2 +- scripts/chart/templates/nfs-server.yaml | 12 ++++++++++++ scripts/chart/values.yaml | 8 ++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index bfd17cc..849a7d7 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ test-kubernetes-yaml: helm dep up ./scripts/chart helm lint ./scripts/chart --values=$(fullConfig) helm lint ./examples/charts/test --values=$(fullConfig) - helm template ./scripts/chart --values=$(fullConfig) | kubectl apply --dry-run=client --validate=true -f - - helm template ./examples/charts/test --values=$(fullConfig) | kubectl apply --dry-run=client --validate=true -f - + helm template ./scripts/chart --values=$(fullConfig) | kubectl apply --dry-run=server --validate=true -f - + helm template ./examples/charts/test --values=$(fullConfig) | kubectl apply --dry-run=server --validate=true -f - install: go run github.com/goreleaser/goreleaser@latest build \ --single-target \ diff --git a/scripts/chart/Chart.yaml b/scripts/chart/Chart.yaml index 91e7f60..8c1aeaa 100644 --- a/scripts/chart/Chart.yaml +++ b/scripts/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: hcloud-k8s-ctl -version: 0.0.1 +version: 0.0.2 dependencies: - name: nfs-subdir-external-provisioner version: "4.0.16" diff --git a/scripts/chart/templates/nfs-server.yaml b/scripts/chart/templates/nfs-server.yaml index e5a35f3..474aba9 100644 --- a/scripts/chart/templates/nfs-server.yaml +++ b/scripts/chart/templates/nfs-server.yaml @@ -36,6 +36,18 @@ spec: spec: priorityClassName: system-cluster-critical containers: +{{ if .Values.deployments.nfs.server.affinity }} + affinity: +{{ toYaml .Values.deployments.nfs.server.affinity | indent 8 }} +{{ end }} +{{ if .Values.deployments.nfs.server.nodeSelector }} + nodeSelector: +{{ toYaml .Values.deployments.nfs.server.nodeSelector | indent 8 }} +{{ end }} +{{ if .Values.deployments.nfs.server.tolerations }} + tolerations: +{{ toYaml .Values.deployments.nfs.server.tolerations | indent 6 }} +{{ end }} - name: nfs-server # git clone git@github.com:sjiveson/nfs-server-alpine.git # cd nfs-server-alpine diff --git a/scripts/chart/values.yaml b/scripts/chart/values.yaml index a52e600..04ff3bc 100644 --- a/scripts/chart/values.yaml +++ b/scripts/chart/values.yaml @@ -1,7 +1,4 @@ -hetznerToken: - main: some-token-string - csi: null - ccm: null +hetznerToken: "some-token-string" clusterName: k8s location: nbg1 deployments: @@ -9,6 +6,9 @@ deployments: server: enabled: false clusterIP: 10.100.0.100 + nodeSelector: {} + tolerations: [] + affinity: {} nfs-subdir-external-provisioner: enabled: false registry: