From 311d31db815a23df21e205aacfd2403083dbc82c Mon Sep 17 00:00:00 2001 From: auricom <27022259+auricom@users.noreply.github.com> Date: Sun, 27 Aug 2023 19:08:43 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20nfd=20rules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/helmrelease.yaml | 4 ---- .../node-feature-discovery/ks.yaml | 21 +++++++++++++++++++ .../rules/google-coral-device.yaml | 15 +++++++++++++ .../rules/kustomization.yaml | 7 +++++++ 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 kubernetes/apps/kube-system/node-feature-discovery/rules/google-coral-device.yaml create mode 100644 kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml diff --git a/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml index 720ab41c8..f9d37af0b 100644 --- a/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml +++ b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml @@ -70,10 +70,6 @@ spec: class: ["02"] vendor: ["2341"] device: ["0042"] - - name: "coral-tpu" - matchOn: - - usbId: - vendor: ["1a6e", "18d1"] - name: "intel-gpu" matchOn: - pciId: diff --git a/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml index 4b10e50b2..35d622e5d 100644 --- a/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml +++ b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml @@ -21,3 +21,24 @@ spec: interval: 30m retryInterval: 1m timeout: 3m +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: cluster-apps-node-feature-discovery-rules + namespace: flux-system + labels: + substitution.flux.home.arpa/enabled: "true" +spec: + dependsOn: + - name: cluster-apps-node-feature-discovery + path: ./kubernetes/apps/kube-system/node-feature-discovery/rules + prune: true + sourceRef: + kind: GitRepository + name: home-ops-kubernetes + wait: true + interval: 30m + retryInterval: 1m + timeout: 5m diff --git a/kubernetes/apps/kube-system/node-feature-discovery/rules/google-coral-device.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/google-coral-device.yaml new file mode 100644 index 000000000..2637b5da3 --- /dev/null +++ b/kubernetes/apps/kube-system/node-feature-discovery/rules/google-coral-device.yaml @@ -0,0 +1,15 @@ +# yaml-language-server: $schema=https://kubernetes-schemas.devbu.io/nfd.k8s-sigs.io/nodefeaturerule_v1alpha1.json +apiVersion: nfd.k8s-sigs.io/v1alpha1 +kind: NodeFeatureRule +metadata: + name: google-coral-device +spec: + rules: + - # Google Coral USB Accelerator + name: google.coral + labels: + google.feature.node.kubernetes.io/coral: "true" + matchFeatures: + - feature: usb.device + matchExpressions: + vendor: { op: In, value: ["1a6e", "18d1"] } diff --git a/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml new file mode 100644 index 000000000..64a415746 --- /dev/null +++ b/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml @@ -0,0 +1,7 @@ +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +resources: + - ./google-coral-device.yaml