diff --git a/deployment/components/common/worker-mounts-combined.yaml b/deployment/components/common/worker-mounts-combined.yaml index 2a1faec0d..2b9a43e12 100644 --- a/deployment/components/common/worker-mounts-combined.yaml +++ b/deployment/components/common/worker-mounts-combined.yaml @@ -13,9 +13,6 @@ - name: host-usr-lib hostPath: path: "/usr/lib" - - name: host-usr-src - hostPath: - path: "/usr/src" - name: source-d hostPath: path: "/etc/kubernetes/node-feature-discovery/source.d/" @@ -41,9 +38,6 @@ - name: host-usr-lib mountPath: "/host-usr/lib" readOnly: true - - name: host-usr-src - mountPath: "/host-usr/src" - readOnly: true - name: source-d mountPath: "/etc/kubernetes/node-feature-discovery/source.d/" readOnly: true diff --git a/deployment/components/common/worker-mounts.yaml b/deployment/components/common/worker-mounts.yaml index 2c3d57ade..1703967a9 100644 --- a/deployment/components/common/worker-mounts.yaml +++ b/deployment/components/common/worker-mounts.yaml @@ -13,9 +13,6 @@ - name: host-usr-lib hostPath: path: "/usr/lib" - - name: host-usr-src - hostPath: - path: "/usr/src" - name: source-d hostPath: path: "/etc/kubernetes/node-feature-discovery/source.d/" @@ -41,9 +38,6 @@ - name: host-usr-lib mountPath: "/host-usr/lib" readOnly: true - - name: host-usr-src - mountPath: "/host-usr/src" - readOnly: true - name: source-d mountPath: "/etc/kubernetes/node-feature-discovery/source.d/" readOnly: true diff --git a/deployment/helm/node-feature-discovery/Chart.yaml b/deployment/helm/node-feature-discovery/Chart.yaml index c3691c7d4..553fc3c07 100644 --- a/deployment/helm/node-feature-discovery/Chart.yaml +++ b/deployment/helm/node-feature-discovery/Chart.yaml @@ -12,4 +12,4 @@ keywords: - feature-detection - node-labels type: application -version: 0.2.0 +version: 0.2.1 diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml index f09a149b1..808f9921e 100644 --- a/deployment/helm/node-feature-discovery/templates/worker.yaml +++ b/deployment/helm/node-feature-discovery/templates/worker.yaml @@ -63,9 +63,11 @@ spec: - name: host-usr-lib mountPath: "/host-usr/lib" readOnly: true + {{- if .Values.worker.mountUsrSrc }} - name: host-usr-src mountPath: "/host-usr/src" readOnly: true + {{- end }} - name: source-d mountPath: "/etc/kubernetes/node-feature-discovery/source.d/" readOnly: true @@ -95,9 +97,11 @@ spec: - name: host-usr-lib hostPath: path: "/usr/lib" + {{- if .Values.worker.mountUsrSrc }} - name: host-usr-src hostPath: path: "/usr/src" + {{- end }} - name: source-d hostPath: path: "/etc/kubernetes/node-feature-discovery/source.d/" diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml index b6a3b8070..de86b0ea3 100644 --- a/deployment/helm/node-feature-discovery/values.yaml +++ b/deployment/helm/node-feature-discovery/values.yaml @@ -206,6 +206,10 @@ worker: runAsNonRoot: true # 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: {} # 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