diff --git a/deployment/components/topology-updater/topologyupdater-mounts.yaml b/deployment/components/topology-updater/topologyupdater-mounts.yaml index a098edf6c8..0f7ceb28e9 100644 --- a/deployment/components/topology-updater/topologyupdater-mounts.yaml +++ b/deployment/components/topology-updater/topologyupdater-mounts.yaml @@ -4,9 +4,6 @@ - name: host-sys hostPath: path: "/sys" - - name: kubelet-podresources-conf - hostPath: - path: /var/lib/kubelet/config.yaml - name: kubelet-podresources-sock hostPath: path: /var/lib/kubelet/pod-resources/kubelet.sock @@ -17,8 +14,6 @@ - op: add path: /spec/template/spec/containers/0/volumeMounts value: - - name: kubelet-podresources-conf - mountPath: /host-var/lib/kubelet/config.yaml - name: kubelet-podresources-sock mountPath: /host-var/lib/kubelet/pod-resources/kubelet.sock - name: host-sys diff --git a/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml b/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml index 2f28b969f2..e91d08322f 100644 --- a/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml +++ b/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml @@ -55,9 +55,14 @@ spec: - "--key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key" - "--cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt" {{- end }} + {{- if .Values.topologyUpdater.kubeletConfigPath | empty | not }} + - "-kubelet-config-uri=file:///host-var/kubelet-config" + {{- end }} volumeMounts: + {{- if .Values.topologyUpdater.kubeletConfigPath | empty | not }} - name: kubelet-config - mountPath: /host-var/lib/kubelet/config.yaml + mountPath: /host-var/kubelet-config + {{- end }} - name: kubelet-podresources-sock mountPath: /host-var/lib/kubelet/pod-resources/kubelet.sock - name: host-sys @@ -79,13 +84,11 @@ spec: - name: host-sys hostPath: path: "/sys" + {{- if .Values.topologyUpdater.kubeletConfigPath | empty | not }} - name: kubelet-config hostPath: - {{- if .Values.topologyUpdater.kubeletConfigPath | empty | not }} path: {{ .Values.topologyUpdater.kubeletConfigPath }} - {{- else }} - path: /var/lib/kubelet/config.yaml - {{- end }} + {{- end }} - name: kubelet-podresources-sock hostPath: {{- if .Values.topologyUpdater.kubeletPodResourcesSockPath | empty | not }}