mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2025-03-17 05:48:21 +00:00
Only read NodeName from env once, at startup
Simplifies the code a bit. Also, log NodeName at startup.
This commit is contained in:
parent
6f73106d01
commit
c54551f599
3 changed files with 7 additions and 11 deletions
|
@ -43,9 +43,6 @@ const (
|
||||||
// ProgramName is the canonical name of this program
|
// ProgramName is the canonical name of this program
|
||||||
ProgramName = "nfd-master"
|
ProgramName = "nfd-master"
|
||||||
|
|
||||||
// NodeNameEnv is the environment variable that contains this node's name.
|
|
||||||
NodeNameEnv = "NODE_NAME"
|
|
||||||
|
|
||||||
// Namespace for feature labels
|
// Namespace for feature labels
|
||||||
labelNs = "feature.node.kubernetes.io/"
|
labelNs = "feature.node.kubernetes.io/"
|
||||||
|
|
||||||
|
@ -57,6 +54,7 @@ const (
|
||||||
var (
|
var (
|
||||||
stdoutLogger = log.New(os.Stdout, "", log.LstdFlags)
|
stdoutLogger = log.New(os.Stdout, "", log.LstdFlags)
|
||||||
stderrLogger = log.New(os.Stderr, "", log.LstdFlags)
|
stderrLogger = log.New(os.Stderr, "", log.LstdFlags)
|
||||||
|
nodeName = os.Getenv("NODE_NAME")
|
||||||
)
|
)
|
||||||
|
|
||||||
// Labels are a Kubernetes representation of discovered features.
|
// Labels are a Kubernetes representation of discovered features.
|
||||||
|
@ -82,6 +80,7 @@ func main() {
|
||||||
stderrLogger.Fatalf("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
|
stderrLogger.Fatalf("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
|
||||||
}
|
}
|
||||||
stdoutLogger.Printf("Node Feature Discovery Master %s", version.Get())
|
stdoutLogger.Printf("Node Feature Discovery Master %s", version.Get())
|
||||||
|
stdoutLogger.Printf("NodeName: '%s'", nodeName)
|
||||||
|
|
||||||
// Parse command-line arguments.
|
// Parse command-line arguments.
|
||||||
args, err := argsParse(nil)
|
args, err := argsParse(nil)
|
||||||
|
@ -213,7 +212,7 @@ func updateMasterNode(helper apihelper.APIHelpers) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
node, err := helper.GetNode(cli, os.Getenv(NodeNameEnv))
|
node, err := helper.GetNode(cli, nodeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,6 @@ limitations under the License.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
@ -37,7 +36,7 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
os.Setenv(NodeNameEnv, mockNodeName)
|
nodeName = mockNodeName
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUpdateNodeFeatures(t *testing.T) {
|
func TestUpdateNodeFeatures(t *testing.T) {
|
||||||
|
|
|
@ -55,15 +55,13 @@ import (
|
||||||
const (
|
const (
|
||||||
// ProgramName is the canonical name of this program
|
// ProgramName is the canonical name of this program
|
||||||
ProgramName = "nfd-worker"
|
ProgramName = "nfd-worker"
|
||||||
|
|
||||||
// NodeNameEnv is the environment variable that contains this node's name.
|
|
||||||
NodeNameEnv = "NODE_NAME"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// package loggers
|
// package loggers
|
||||||
var (
|
var (
|
||||||
stdoutLogger = log.New(os.Stdout, "", log.LstdFlags)
|
stdoutLogger = log.New(os.Stdout, "", log.LstdFlags)
|
||||||
stderrLogger = log.New(os.Stderr, "", log.LstdFlags)
|
stderrLogger = log.New(os.Stderr, "", log.LstdFlags)
|
||||||
|
nodeName = os.Getenv("NODE_NAME")
|
||||||
)
|
)
|
||||||
|
|
||||||
// Global config
|
// Global config
|
||||||
|
@ -104,6 +102,7 @@ func main() {
|
||||||
stderrLogger.Fatalf("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
|
stderrLogger.Fatalf("version not set! Set -ldflags \"-X sigs.k8s.io/node-feature-discovery/pkg/version.version=`git describe --tags --dirty --always`\" during build or run.")
|
||||||
}
|
}
|
||||||
stdoutLogger.Printf("Node Feature Discovery Worker %s", version.Get())
|
stdoutLogger.Printf("Node Feature Discovery Worker %s", version.Get())
|
||||||
|
stdoutLogger.Printf("NodeName: '%s'", nodeName)
|
||||||
|
|
||||||
// Parse command-line arguments.
|
// Parse command-line arguments.
|
||||||
args, err := argsParse(nil)
|
args, err := argsParse(nil)
|
||||||
|
@ -427,8 +426,7 @@ func advertiseFeatureLabels(client pb.LabelerClient, labels Labels) error {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
nodeName := os.Getenv(NodeNameEnv)
|
stdoutLogger.Printf("Sendng labeling request nfd-master")
|
||||||
stdoutLogger.Printf("%s: %s", NodeNameEnv, nodeName)
|
|
||||||
|
|
||||||
labelReq := pb.SetLabelsRequest{Labels: labels,
|
labelReq := pb.SetLabelsRequest{Labels: labels,
|
||||||
NfdVersion: version.Get(),
|
NfdVersion: version.Get(),
|
||||||
|
|
Loading…
Add table
Reference in a new issue