From b02b057763e0025c1282554776ef676a0028ee05 Mon Sep 17 00:00:00 2001
From: Kenny Ho <y2kenny@gmail.com>
Date: Wed, 29 Apr 2020 23:17:39 -0400
Subject: [PATCH] Pass node name to labeller via env var
---
cmd/k8s-node-labeller/main.go | 6 +-----
k8s-ds-amdgpu-labeller.yaml | 11 ++++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/cmd/k8s-node-labeller/main.go b/cmd/k8s-node-labeller/main.go
index b745e972..b8a960ea 100644
--- a/cmd/k8s-node-labeller/main.go
+++ b/cmd/k8s-node-labeller/main.go
@@ -293,11 +293,7 @@ func main() {
}
// laballer only respond to event about the node it is on by matching hostname
- b, err := ioutil.ReadFile("/labeller/hostname")
- if err != nil {
- entryLog.Error(err, "Cannot read hostname")
- }
- hostname := strings.TrimSpace(string(b))
+ hostname := os.Getenv("DS_NODE_NAME")
pred := predicate.Funcs{
// Create returns true if the Create event should be processed
diff --git a/k8s-ds-amdgpu-labeller.yaml b/k8s-ds-amdgpu-labeller.yaml
index c417df1c..8c896ab9 100644
--- a/k8s-ds-amdgpu-labeller.yaml
+++ b/k8s-ds-amdgpu-labeller.yaml
@@ -49,9 +49,15 @@ spec:
containers:
- image: rocm/k8s-device-plugin:labeller-latest
name: amdgpu-lr-cntr
+ imagePullPolicy: Always
workingDir: /root
command: ["./k8s-node-labeller"]
args: ["-vram", "-cu-count", "-simd-count", "-device-id", "-family"]
+ env:
+ - name: DS_NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
securityContext:
privileged: true #Needed for /dev
capabilities:
@@ -61,8 +67,6 @@ spec:
mountPath: /sys
- name: dev
mountPath: /dev
- - name: etc
- mountPath: /labeller
volumes:
- name: sys
hostPath:
@@ -70,6 +74,3 @@ spec:
- name: dev
hostPath:
path: /dev
- - name: etc
- hostPath:
- path: /etc
--
GitLab