Merge pull request #2530 from yevgeny-shnaidman/yevgeny/adding-configmap

MGMT-19498: Adding accelerators configuration file to the node-exporter

Author: openshift-merge-bot[bot]

assets/node-exporter/accelerators-collector-configmap.yaml

@@ -0,0 +1,29 @@
+apiVersion: v1
+data:
+  config.yaml: |-
+    - "models":
+      - "pciID": "0x20b5"
+        "pciName": "A100"
+      - "pciID": "0x2230"
+        "pciName": "RTX_A6000"
+      - "pciID": "0x2717"
+        "pciName": "RTX_4090"
+      - "pciID": "0x2235"
+        "pciName": "A40"
+      - "pciID": "0x1df5"
+        "pciName": "V100"
+      - "pciID": "0x20f1"
+        "pciName": "A100 40G"
+      - "pciID": "0x1ff2"
+        "pciName": "T400 4GB"
+      - "pciID": "0x1eb8"
+        "pciName": "Tesla T4"
+      "vendorID": "0x10de"
+      "vendorName": "NVIDIA"
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/managed-by: cluster-monitoring-operator
+    app.kubernetes.io/part-of: openshift-monitoring
+  name: node-exporter-accelerators-collector-config
+  namespace: openshift-monitoring

assets/node-exporter/daemonset.yaml

@@ -79,6 +79,9 @@ spec:
         - mountPath: /var/node_exporter/textfile
           name: node-exporter-textfile
           readOnly: true
+        - mountPath: /var/node_exporter/accelerators_collector_config
+          name: node-exporter-accelerators-collector-config
+          readOnly: true
         workingDir: /var/node_exporter/textfile
       - args:
         - --secure-listen-address=[$(IP)]:9100
@@ -182,6 +185,12 @@ spec:
       - name: node-exporter-kube-rbac-proxy-config
         secret:
           secretName: node-exporter-kube-rbac-proxy-config
+      - configMap:
+          items:
+          - key: config.yaml
+            path: config.yaml
+          name: node-exporter-accelerators-collector-config
+        name: node-exporter-accelerators-collector-config
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 10%

jsonnet/components/node-exporter.libsonnet

@@ -3,6 +3,26 @@ local textfileVolumeName = 'node-exporter-textfile';
 local tlsVolumeName = 'node-exporter-tls';
 local wtmpPath = '/var/log/wtmp';
 local wtmpVolumeName = 'node-exporter-wtmp';
+local configDir = '/var/node_exporter/accelerators_collector_config';
+local configVolumeName = 'node-exporter-accelerators-collector-config';
+local acceleratorsConfigFileName = 'config.yaml';
+local acceleratorsConfigMapName = 'node-exporter-accelerators-collector-config';
+local acceleratorsConfigData = [
+  {
+    vendorName: 'NVIDIA',
+    vendorID: '0x10de',
+    models: [
+      { pciID: '0x20b5', pciName: 'A100' },
+      { pciID: '0x2230', pciName: 'RTX_A6000' },
+      { pciID: '0x2717', pciName: 'RTX_4090' },
+      { pciID: '0x2235', pciName: 'A40' },
+      { pciID: '0x1df5', pciName: 'V100' },
+      { pciID: '0x20f1', pciName: 'A100 40G' },
+      { pciID: '0x1ff2', pciName: 'T400 4GB' },
+      { pciID: '0x1eb8', pciName: 'Tesla T4' },
+    ],
+  },
+];
 
 local nodeExporter = import 'github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/components/node-exporter.libsonnet';
 local generateSecret = import '../utils/generate-secret.libsonnet';
@@ -269,11 +289,18 @@ function(params)
                           exec /bin/node_exporter "$0" "$@"
                         |||,
                       ],
-                      volumeMounts+: [{
-                        mountPath: textfileDir,
-                        name: textfileVolumeName,
-                        readOnly: true,
-                      }],
+                      volumeMounts+: [
+                        {
+                          mountPath: textfileDir,
+                          name: textfileVolumeName,
+                          readOnly: true,
+                        },
+                        {
+                          mountPath: configDir,
+                          name: configVolumeName,
+                          readOnly: true,
+                        },
+                      ],
                       workingDir: textfileDir,
                       resources+: {
                         requests+: {
@@ -324,6 +351,18 @@ function(params)
                   secretName: 'node-exporter-kube-rbac-proxy-config',
                 },
               },
+              {
+                name: configVolumeName,
+                configMap: {
+                  name: acceleratorsConfigMapName,
+                  items: [
+                    {
+                      key: acceleratorsConfigFileName,
+                      path: acceleratorsConfigFileName,
+                    },
+                  ],
+                },
+              },
             ],
             securityContext: {},
             priorityClassName: 'system-cluster-critical',
@@ -350,4 +389,16 @@ function(params)
         ],
       },
     },
+
+    acceleratorsCollectorConfigmap: {
+      apiVersion: 'v1',
+      kind: 'ConfigMap',
+      metadata: {
+        name: acceleratorsConfigMapName,
+        namespace: cfg.namespace,
+      },
+      data: {
+        [acceleratorsConfigFileName]: std.manifestYamlDoc(acceleratorsConfigData),
+      },
+    },
   }

pkg/manifests/manifests.go

@@ -138,6 +138,7 @@ var (
 	NodeExporterMinimalServiceMonitor      = "node-exporter/minimal-service-monitor.yaml"
 	NodeExporterPrometheusRule             = "node-exporter/prometheus-rule.yaml"
 	NodeExporterKubeRbacProxySecret        = "node-exporter/kube-rbac-proxy-secret.yaml"
+	NodeExporterAcceleratorsConfigMap      = "node-exporter/accelerators-collector-configmap.yaml"
 
 	PrometheusK8sClusterRoleBinding               = "prometheus-k8s/cluster-role-binding.yaml"
 	PrometheusK8sRoleBindingConfig                = "prometheus-k8s/role-binding-config.yaml"
@@ -1033,6 +1034,10 @@ func (f *Factory) NodeExporterRBACProxySecret() (*v1.Secret, error) {
 	return f.NewSecret(f.assets.MustNewAssetSlice(NodeExporterKubeRbacProxySecret))
 }
 
+func (f *Factory) NodeExporterAcceleratorsCollectorConfigMap() (*v1.ConfigMap, error) {
+	return f.NewConfigMap(f.assets.MustNewAssetSlice(NodeExporterAcceleratorsConfigMap))
+}
+
 func (f *Factory) PrometheusK8sClusterRoleBinding() (*rbacv1.ClusterRoleBinding, error) {
 	return f.NewClusterRoleBinding(f.assets.MustNewAssetSlice(PrometheusK8sClusterRoleBinding))
 }

pkg/tasks/nodeexporter.go

@@ -94,6 +94,15 @@ func (t *NodeExporterTask) Run(ctx context.Context) error {
 		return fmt.Errorf("reconciling node-exporter Service failed: %w", err)
 	}
 
+	cm, err := t.factory.NodeExporterAcceleratorsCollectorConfigMap()
+	if err != nil {
+		return fmt.Errorf("initializing node-exporter accelerators collector ConfigMap failed: %w", err)
+	}
+	err = t.client.CreateOrUpdateConfigMap(ctx, cm)
+	if err != nil {
+		return fmt.Errorf("reconciling node-exporter accelerators collector ConfigMap failed: %w", err)
+	}
+
 	ds, err := t.factory.NodeExporterDaemonSet()
 	if err != nil {
 		return fmt.Errorf("initializing node-exporter DaemonSet failed: %w", err)