Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backports/v0.10: Set node_name to hostname if NODE_NAME envvar is not found #2129

Merged
merged 1 commit into from
Feb 21, 2024
+16 −5
Merged

backports/v0.10: Set node_name to hostname if NODE_NAME envvar is not found #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/grpc/process_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func TestProcessManager_GetProcessExec(t *testing.T) {
}

func Test_getNodeNameForExport(t *testing.T) {
assert.Equal(t, "", node.GetNodeNameForExport())
assert.NotEqual(t, "", node.GetNodeNameForExport()) // we should get the hostname here
assert.NoError(t, os.Setenv("NODE_NAME", "from-node-name"))
assert.Equal(t, "from-node-name", node.GetNodeNameForExport())
assert.NoError(t, os.Setenv("HUBBLE_NODE_NAME", "from-hubble-node-name"))
Expand Down
19 changes: 15 additions & 4 deletions pkg/reader/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
// Copyright Authors of Tetragon
package node

import "os"
import (
"os"

"github.com/cilium/tetragon/pkg/logger"
)

// getNodeNameForExport returns node name string for JSON export. It uses NODE_NAME
// env variable by default, which is also used by k8s watcher to watch for local pods:
Expand All @@ -11,9 +15,16 @@ import "os"
//
// Set HUBBLE_NODE_NAME to override the node_name field for JSON export.
func GetNodeNameForExport() string {
var err error
nodeName := os.Getenv("HUBBLE_NODE_NAME")
if nodeName != "" {
return nodeName
if nodeName == "" {
nodeName = os.Getenv("NODE_NAME")
}
if nodeName == "" {
nodeName, err = os.Hostname()
if err != nil {
logger.GetLogger().WithError(err).Warn("failed to retrieve hostname")
}
}
return os.Getenv("NODE_NAME")
return nodeName
}
Loading