diff --git a/deployment/helm/node-feature-discovery/templates/_helpers.tpl b/deployment/helm/node-feature-discovery/templates/_helpers.tpl index 08760ea01..39c1e3df7 100644 --- a/deployment/helm/node-feature-discovery/templates/_helpers.tpl +++ b/deployment/helm/node-feature-discovery/templates/_helpers.tpl @@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} +{{/* +Allow the release namespace to be overridden for multi-namespace deployments in combined charts +*/}} +{{- define "node-feature-discovery.namespace" -}} + {{- if .Values.namespaceOverride -}} + {{- .Values.namespaceOverride -}} + {{- else -}} + {{- .Release.Namespace -}} + {{- end -}} +{{- end -}} + {{/* Create chart name and version as used by the chart label. */}} diff --git a/deployment/helm/node-feature-discovery/templates/cert-manager-certs.yaml b/deployment/helm/node-feature-discovery/templates/cert-manager-certs.yaml index 9e3a31127..ac2e51fc1 100644 --- a/deployment/helm/node-feature-discovery/templates/cert-manager-certs.yaml +++ b/deployment/helm/node-feature-discovery/templates/cert-manager-certs.yaml @@ -4,6 +4,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: nfd-master-cert + namespace: {{ include "node-feature-discovery.namespace" . }} spec: secretName: nfd-master-cert subject: @@ -14,8 +15,8 @@ spec: # must match the service name - {{ include "node-feature-discovery.fullname" . }}-master # first one is configured for use by the worker; below are for completeness - - {{ include "node-feature-discovery.fullname" . }}-master.{{ $.Release.Namespace }}.svc - - {{ include "node-feature-discovery.fullname" . }}-master.{{ $.Release.Namespace }}.svc.cluster.local + - {{ include "node-feature-discovery.fullname" . }}-master.{{ include "node-feature-discovery.namespace" . }}.svc + - {{ include "node-feature-discovery.fullname" . }}-master.{{ include "node-feature-discovery.namespace" . }}.svc.cluster.local # localhost needed for grpc_health_probe - localhost issuerRef: @@ -28,6 +29,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: nfd-worker-cert + namespace: {{ include "node-feature-discovery.namespace" . }} spec: secretName: nfd-worker-cert subject: @@ -35,7 +37,7 @@ spec: - node-feature-discovery commonName: nfd-worker dnsNames: - - {{ include "node-feature-discovery.fullname" . }}-worker.{{ $.Release.Namespace }}.svc.cluster.local + - {{ include "node-feature-discovery.fullname" . }}-worker.{{ include "node-feature-discovery.namespace" . }}.svc.cluster.local issuerRef: name: nfd-ca-issuer kind: Issuer @@ -47,6 +49,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: nfd-topology-updater-cert + namespace: {{ include "node-feature-discovery.namespace" . }} spec: secretName: nfd-topology-updater-cert subject: @@ -54,7 +57,7 @@ spec: - node-feature-discovery commonName: nfd-topology-updater dnsNames: - - {{ include "node-feature-discovery.fullname" . }}-topology-updater.{{ $.Release.Namespace }}.svc.cluster.local + - {{ include "node-feature-discovery.fullname" . }}-topology-updater.{{ include "node-feature-discovery.namespace" . }}.svc.cluster.local issuerRef: name: nfd-ca-issuer kind: Issuer diff --git a/deployment/helm/node-feature-discovery/templates/cert-manager-issuer.yaml b/deployment/helm/node-feature-discovery/templates/cert-manager-issuer.yaml index 0401edd69..f3c57acea 100644 --- a/deployment/helm/node-feature-discovery/templates/cert-manager-issuer.yaml +++ b/deployment/helm/node-feature-discovery/templates/cert-manager-issuer.yaml @@ -8,6 +8,7 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: nfd-ca-bootstrap + namespace: {{ include "node-feature-discovery.namespace" . }} spec: selfSigned: {} @@ -16,6 +17,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: nfd-ca-cert + namespace: {{ include "node-feature-discovery.namespace" . }} spec: isCA: true secretName: nfd-ca-cert @@ -33,6 +35,7 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: name: nfd-ca-issuer + namespace: {{ include "node-feature-discovery.namespace" . }} spec: ca: secretName: nfd-ca-cert diff --git a/deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml b/deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml index 40033c64e..5bceb41e7 100644 --- a/deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml +++ b/deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml @@ -12,7 +12,7 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "node-feature-discovery.master.serviceAccountName" . }} - namespace: {{ $.Release.Namespace }} + namespace: {{ include "node-feature-discovery.namespace" . }} {{- end }} --- @@ -30,5 +30,5 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "node-feature-discovery.topologyUpdater.serviceAccountName" . }} - namespace: {{ $.Release.Namespace }} + namespace: {{ include "node-feature-discovery.namespace" . }} {{- end }} diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml index ce28646df..498964f8a 100644 --- a/deployment/helm/node-feature-discovery/templates/master.yaml +++ b/deployment/helm/node-feature-discovery/templates/master.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "node-feature-discovery.fullname" . }}-master + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} role: master diff --git a/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml b/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml index 93c8d86d0..61d2a481a 100644 --- a/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml +++ b/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "node-feature-discovery.fullname" . }}-worker-conf + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} data: diff --git a/deployment/helm/node-feature-discovery/templates/service.yaml b/deployment/helm/node-feature-discovery/templates/service.yaml index 97d0a5878..95b6d10b4 100644 --- a/deployment/helm/node-feature-discovery/templates/service.yaml +++ b/deployment/helm/node-feature-discovery/templates/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "node-feature-discovery.fullname" . }}-master + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} role: master diff --git a/deployment/helm/node-feature-discovery/templates/serviceaccount.yaml b/deployment/helm/node-feature-discovery/templates/serviceaccount.yaml index 025c30a57..883e5daab 100644 --- a/deployment/helm/node-feature-discovery/templates/serviceaccount.yaml +++ b/deployment/helm/node-feature-discovery/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "node-feature-discovery.master.serviceAccountName" . }} + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} {{- with .Values.master.serviceAccount.annotations }} @@ -17,6 +18,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "node-feature-discovery.topologyUpdater.serviceAccountName" . }} + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} {{- with .Values.topologyUpdater.serviceAccount.annotations }} @@ -31,6 +33,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "node-feature-discovery.worker.serviceAccountName" . }} + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} {{- with .Values.worker.serviceAccount.annotations }} diff --git a/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml b/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml index ffddc1903..be48c5fe7 100644 --- a/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml +++ b/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ include "node-feature-discovery.fullname" . }}-topology-updater + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} role: topology-updater diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml index 955b6a358..8e41039f1 100644 --- a/deployment/helm/node-feature-discovery/templates/worker.yaml +++ b/deployment/helm/node-feature-discovery/templates/worker.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ include "node-feature-discovery.fullname" . }}-worker + namespace: {{ include "node-feature-discovery.namespace" . }} labels: {{- include "node-feature-discovery.labels" . | nindent 4 }} role: worker diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml index 466c75dbb..de996457d 100644 --- a/deployment/helm/node-feature-discovery/values.yaml +++ b/deployment/helm/node-feature-discovery/values.yaml @@ -8,6 +8,7 @@ imagePullSecrets: [] nameOverride: "" fullnameOverride: "" +namespaceOverride: "" nodeFeatureRule: createCRD: true