mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-17 05:48:21 +00:00
Code Activity

Merge pull request #1403 from ArangoGutierrez/manual-cherry-shiva

Browse source 
[Release-0.14]Fix serviceaccount handling for nfd-gc to be consistent with others
This commit is contained in:
Kubernetes Prow Robot 2023-10-09 14:29:16 +02:00 • committed by GitHub
commit 0646b216af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deployment/helm/node-feature-discovery/templates/clusterrolebinding.yaml
View file

@ -47,6 +47,6 @@ roleRef:
name: {{ include "node-feature-discovery.fullname" . }}-gc
subjects:
- kind: ServiceAccount
name: {{ .Values.gc.serviceAccount.name | default "nfd-gc" }}
name: {{ include "node-feature-discovery.gc.serviceAccountName" . }}
namespace: {{ include "node-feature-discovery.namespace" . }}
{{- end }}

2
deployment/helm/node-feature-discovery/templates/nfd-gc.yaml
View file

@ -27,7 +27,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ .Values.gc.serviceAccountName | default "nfd-gc" }}
serviceAccountName: {{ include "node-feature-discovery.gc.serviceAccountName" . }}
dnsPolicy: ClusterFirstWithHostNet
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

4
deployment/helm/node-feature-discovery/templates/serviceaccount.yaml
View file

@ -27,12 +27,12 @@ metadata:
{{- end }}
{{- end }}
{{- if and .Values.gc.enable .Values.gc.rbac.create (or .Values.enableNodeFeatureApi .Values.topologyUpdater.enable) }}
{{- if and .Values.gc.enable .Values.gc.serviceAccount.create (or .Values.enableNodeFeatureApi .Values.topologyUpdater.enable) }}
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ .Values.gc.serviceAccount.name | default "nfd-gc" }}
name: {{ include "node-feature-discovery.gc.serviceAccountName" . }}
namespace: {{ include "node-feature-discovery.namespace" . }}
labels:
{{- include "node-feature-discovery.labels" . | nindent 4 }}