diff --git a/charts/nfs-subdir-external-provisioner/templates/_helpers.tpl b/charts/nfs-subdir-external-provisioner/templates/_helpers.tpl index 5c76a13a..7628707c 100644 --- a/charts/nfs-subdir-external-provisioner/templates/_helpers.tpl +++ b/charts/nfs-subdir-external-provisioner/templates/_helpers.tpl @@ -6,6 +6,12 @@ Expand the name of the chart. {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} +Specify Namespace to deploy the resources if not the helm release namespace + +{{- define "nfs-subdir-external-provisioner.namespace" -}} +{{- default .Release.namespace .Values.namespace -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). diff --git a/charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml b/charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml index c5e55824..637a9ac2 100644 --- a/charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/clusterrolebinding.yaml @@ -8,7 +8,7 @@ metadata: subjects: - kind: ServiceAccount name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} roleRef: kind: ClusterRole name: {{ template "nfs-subdir-external-provisioner.fullname" . }}-runner diff --git a/charts/nfs-subdir-external-provisioner/templates/deployment.yaml b/charts/nfs-subdir-external-provisioner/templates/deployment.yaml index 15a574b2..78f35ea7 100644 --- a/charts/nfs-subdir-external-provisioner/templates/deployment.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "nfs-subdir-external-provisioner.fullname" . }} + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} labels: {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }} spec: diff --git a/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml b/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml index 993dc53e..fc6f303a 100644 --- a/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/persistentvolumeclaim.yaml @@ -3,6 +3,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: pvc-{{ template "nfs-subdir-external-provisioner.fullname" . }} + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} labels: {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }} spec: diff --git a/charts/nfs-subdir-external-provisioner/templates/poddisruptionbudget.yaml b/charts/nfs-subdir-external-provisioner/templates/poddisruptionbudget.yaml index b3f9d403..7c30a5dc 100644 --- a/charts/nfs-subdir-external-provisioner/templates/poddisruptionbudget.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/poddisruptionbudget.yaml @@ -2,6 +2,7 @@ apiVersion: {{ template "podDisruptionBudget.apiVersion" . }} kind: PodDisruptionBudget metadata: + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} labels: {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }} name: {{ template "nfs-subdir-external-provisioner.fullname" . }} diff --git a/charts/nfs-subdir-external-provisioner/templates/role.yaml b/charts/nfs-subdir-external-provisioner/templates/role.yaml index 9d175812..84cc4392 100644 --- a/charts/nfs-subdir-external-provisioner/templates/role.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/role.yaml @@ -2,6 +2,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} labels: {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }} name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }} diff --git a/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml b/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml index 6bba9601..a3c05be5 100644 --- a/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/rolebinding.yaml @@ -2,13 +2,14 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} labels: {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }} name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }} subjects: - kind: ServiceAccount name: {{ template "nfs-subdir-external-provisioner.serviceAccountName" . }} - namespace: {{ .Release.Namespace }} + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} roleRef: kind: Role name: leader-locking-{{ template "nfs-subdir-external-provisioner.fullname" . }} diff --git a/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml b/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml index a68ff9e3..4218a125 100644 --- a/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml +++ b/charts/nfs-subdir-external-provisioner/templates/serviceaccount.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + namespace: {{ template "nfs-subdir-external-provisioner.namespace" . }} labels: {{- include "nfs-subdir-external-provisioner.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} diff --git a/charts/nfs-subdir-external-provisioner/values.yaml b/charts/nfs-subdir-external-provisioner/values.yaml index b7d11878..b05e31be 100644 --- a/charts/nfs-subdir-external-provisioner/values.yaml +++ b/charts/nfs-subdir-external-provisioner/values.yaml @@ -1,6 +1,9 @@ replicaCount: 1 strategyType: Recreate +# Specify Namespace to deploy the nfs-subdir-external-provisioner resource if not the helm release namepsace +namespace: "" + image: repository: registry.k8s.io/sig-storage/nfs-subdir-external-provisioner tag: v4.0.2