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-31 04:04:51 +00:00
Code Activity

Merge pull request #585 from jonkerj/optional-hostpaths

Browse source 
deployment: make /usr/src hostpath mount optional
This commit is contained in:
Kubernetes Prow Robot 2021-08-27 01:18:04 -07:00 • committed by GitHub
commit 487588bc62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
deployment/components/common/worker-mounts-combined.yaml
View file

@ -13,9 +13,6 @@
- name: host-usr-lib - name: host-usr-lib
hostPath: hostPath:
path: "/usr/lib" path: "/usr/lib"
- name: host-usr-src
hostPath:
path: "/usr/src"
- name: source-d - name: source-d
hostPath: hostPath:
path: "/etc/kubernetes/node-feature-discovery/source.d/" path: "/etc/kubernetes/node-feature-discovery/source.d/"
@ -41,9 +38,6 @@
- name: host-usr-lib - name: host-usr-lib
mountPath: "/host-usr/lib" mountPath: "/host-usr/lib"
readOnly: true readOnly: true
- name: host-usr-src
mountPath: "/host-usr/src"
readOnly: true
- name: source-d - name: source-d
mountPath: "/etc/kubernetes/node-feature-discovery/source.d/" mountPath: "/etc/kubernetes/node-feature-discovery/source.d/"
readOnly: true readOnly: true

6
deployment/components/common/worker-mounts.yaml
View file

@ -13,9 +13,6 @@
- name: host-usr-lib - name: host-usr-lib
hostPath: hostPath:
path: "/usr/lib" path: "/usr/lib"
- name: host-usr-src
hostPath:
path: "/usr/src"
- name: source-d - name: source-d
hostPath: hostPath:
path: "/etc/kubernetes/node-feature-discovery/source.d/" path: "/etc/kubernetes/node-feature-discovery/source.d/"
@ -41,9 +38,6 @@
- name: host-usr-lib - name: host-usr-lib
mountPath: "/host-usr/lib" mountPath: "/host-usr/lib"
readOnly: true readOnly: true
- name: host-usr-src
mountPath: "/host-usr/src"
readOnly: true
- name: source-d - name: source-d
mountPath: "/etc/kubernetes/node-feature-discovery/source.d/" mountPath: "/etc/kubernetes/node-feature-discovery/source.d/"
readOnly: true readOnly: true

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

@ -12,4 +12,4 @@ keywords:
- feature-detection - feature-detection
- node-labels - node-labels
type: application type: application
version: 0.2.0 version: 0.2.1

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

@ -63,9 +63,11 @@ spec:
- name: host-usr-lib - name: host-usr-lib
mountPath: "/host-usr/lib" mountPath: "/host-usr/lib"
readOnly: true readOnly: true
{{- if .Values.worker.mountUsrSrc }}
- name: host-usr-src - name: host-usr-src
mountPath: "/host-usr/src" mountPath: "/host-usr/src"
readOnly: true readOnly: true
{{- end }}
- name: source-d - name: source-d
mountPath: "/etc/kubernetes/node-feature-discovery/source.d/" mountPath: "/etc/kubernetes/node-feature-discovery/source.d/"
readOnly: true readOnly: true
@ -95,9 +97,11 @@ spec:
- name: host-usr-lib - name: host-usr-lib
hostPath: hostPath:
path: "/usr/lib" path: "/usr/lib"
{{- if .Values.worker.mountUsrSrc }}
- name: host-usr-src - name: host-usr-src
hostPath: hostPath:
path: "/usr/src" path: "/usr/src"
{{- end }}
- name: source-d - name: source-d
hostPath: hostPath:
path: "/etc/kubernetes/node-feature-discovery/source.d/" path: "/etc/kubernetes/node-feature-discovery/source.d/"

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

@ -206,6 +206,10 @@ worker:
runAsNonRoot: true runAsNonRoot: true
# runAsUser: 1000 # runAsUser: 1000
# Allow users to mount the hostPath /usr/src, useful for RHCOS on s390x
# Does not work on systems without /usr/src AND a read-only /usr, such as Talos
mountUsrSrc: false
resources: {} resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious # We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little # choice for the user. This also increases chances charts run on environments with little