2019-02-08 21:43:54 +02:00
|
|
|
/*
|
2021-02-19 15:43:31 +02:00
|
|
|
Copyright 2019-2021 The Kubernetes Authors.
|
2019-02-08 21:43:54 +02:00
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package nfdworker
|
|
|
|
|
|
|
|
import (
|
|
|
|
"crypto/tls"
|
|
|
|
"crypto/x509"
|
2020-04-21 22:03:37 +03:00
|
|
|
"encoding/json"
|
2019-02-08 21:43:54 +02:00
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
2020-11-27 08:26:22 +02:00
|
|
|
"path/filepath"
|
2019-02-08 21:43:54 +02:00
|
|
|
"regexp"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
|
2020-11-27 08:26:22 +02:00
|
|
|
"github.com/fsnotify/fsnotify"
|
2019-02-08 21:43:54 +02:00
|
|
|
"golang.org/x/net/context"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"google.golang.org/grpc/credentials"
|
|
|
|
"k8s.io/apimachinery/pkg/util/validation"
|
2021-02-23 10:05:13 +02:00
|
|
|
"k8s.io/klog/v2"
|
2021-02-19 15:43:31 +02:00
|
|
|
"sigs.k8s.io/yaml"
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
pb "sigs.k8s.io/node-feature-discovery/pkg/labeler"
|
2021-02-19 15:43:31 +02:00
|
|
|
"sigs.k8s.io/node-feature-discovery/pkg/utils"
|
2019-02-08 21:43:54 +02:00
|
|
|
"sigs.k8s.io/node-feature-discovery/pkg/version"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/cpu"
|
2020-02-16 17:43:12 +02:00
|
|
|
"sigs.k8s.io/node-feature-discovery/source/custom"
|
2019-02-08 21:43:54 +02:00
|
|
|
"sigs.k8s.io/node-feature-discovery/source/fake"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/iommu"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/kernel"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/local"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/memory"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/network"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/pci"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/storage"
|
|
|
|
"sigs.k8s.io/node-feature-discovery/source/system"
|
usb: Add support for USB device discovery
This builds on the PCI support to enable the discovery of USB devices.
This is primarily intended to be used for the discovery of Edge-based
heterogeneous accelerators that are connected via USB, such as the Coral
USB Accelerator and the Intel NCS2 - our main motivation for adding this
capability to NFD, and as part of our work in the SODALITE H2020
project.
USB devices may define their base class at either the device or
interface levels. In the case where no device class is set, the
per-device interfaces are enumerated instead. USB devices may
furthermore have multiple interfaces, which may or may not use the
identical class across each interface. We therefore report device
existence for each unique class definition to enable more fine-grained
labelling and node selection.
The default labelling format includes the class, vendor and device
(product) IDs, as follows:
feature.node.kubernetes.io/usb-fe_1a6e_089a.present=true
As with PCI, a subset of device classes are whitelisted for matching.
By default, there are only a subset of device classes under which
accelerators tend to be mapped, which is used as the basis for
the whitelist. These are:
- Video
- Miscellaneous
- Application Specific
- Vendor Specific
For those interested in matching other classes, this may be extended
by using the UsbId rule provided through the custom source. A full
list of class codes is provided by the USB-IF at:
https://www.usb.org/defined-class-codes
For the moment, owing to a lack of a demonstrable use case, neither
the subclass nor the protocol information are exposed. If this
becomes necessary, support for these attributes can be trivially
added.
Signed-off-by: Paul Mundt <paul.mundt@adaptant.io>
2020-05-14 22:32:55 +02:00
|
|
|
"sigs.k8s.io/node-feature-discovery/source/usb"
|
2019-02-08 21:43:54 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
2021-02-23 10:05:13 +02:00
|
|
|
nodeName = os.Getenv("NODE_NAME")
|
2019-02-08 21:43:54 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
// Global config
|
|
|
|
type NFDConfig struct {
|
2020-11-27 10:19:31 +02:00
|
|
|
Core coreConfig
|
2020-04-21 22:03:37 +03:00
|
|
|
Sources sourcesConfig
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
2020-11-27 10:19:31 +02:00
|
|
|
type coreConfig struct {
|
2021-02-23 20:42:17 +02:00
|
|
|
Klog map[string]string
|
2021-02-19 15:43:31 +02:00
|
|
|
LabelWhiteList utils.RegexpVal
|
2020-12-01 14:54:59 +02:00
|
|
|
NoPublish bool
|
2020-12-01 15:53:04 +02:00
|
|
|
Sources []string
|
2020-12-01 14:54:59 +02:00
|
|
|
SleepInterval duration
|
2020-11-27 10:19:31 +02:00
|
|
|
}
|
|
|
|
|
2020-04-21 22:03:37 +03:00
|
|
|
type sourcesConfig map[string]source.Config
|
2019-02-08 21:43:54 +02:00
|
|
|
|
|
|
|
// Labels are a Kubernetes representation of discovered features.
|
|
|
|
type Labels map[string]string
|
|
|
|
|
|
|
|
// Command line arguments
|
|
|
|
type Args struct {
|
|
|
|
CaFile string
|
|
|
|
CertFile string
|
|
|
|
KeyFile string
|
|
|
|
ConfigFile string
|
|
|
|
Options string
|
|
|
|
Oneshot bool
|
|
|
|
Server string
|
|
|
|
ServerNameOverride string
|
2021-02-19 15:43:31 +02:00
|
|
|
|
2021-02-23 20:42:17 +02:00
|
|
|
Klog map[string]*utils.KlogFlagVal
|
2021-02-19 15:43:31 +02:00
|
|
|
Overrides ConfigOverrideArgs
|
|
|
|
}
|
|
|
|
|
|
|
|
// ConfigOverrideArgs are args that override config file options
|
|
|
|
type ConfigOverrideArgs struct {
|
|
|
|
NoPublish *bool
|
|
|
|
|
|
|
|
// Deprecated
|
|
|
|
LabelWhiteList *utils.RegexpVal
|
2020-12-01 14:54:59 +02:00
|
|
|
SleepInterval *time.Duration
|
2021-02-19 15:43:31 +02:00
|
|
|
Sources *utils.StringSliceVal
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
type NfdWorker interface {
|
|
|
|
Run() error
|
2021-02-11 21:38:13 +02:00
|
|
|
Stop()
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
type nfdWorker struct {
|
2020-04-21 19:40:01 +03:00
|
|
|
args Args
|
|
|
|
clientConn *grpc.ClientConn
|
|
|
|
client pb.LabelerClient
|
2020-11-27 10:19:31 +02:00
|
|
|
configFilePath string
|
|
|
|
config *NFDConfig
|
2020-12-01 15:53:04 +02:00
|
|
|
realSources []source.FeatureSource
|
2021-02-11 21:38:13 +02:00
|
|
|
stop chan struct{} // channel for signaling stop
|
2020-12-01 15:53:04 +02:00
|
|
|
testSources []source.FeatureSource
|
|
|
|
enabledSources []source.FeatureSource
|
2020-12-01 14:54:59 +02:00
|
|
|
}
|
|
|
|
|
2020-12-01 14:27:47 +02:00
|
|
|
type duration struct {
|
|
|
|
time.Duration
|
|
|
|
}
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
// Create new NfdWorker instance.
|
2021-02-19 15:43:31 +02:00
|
|
|
func NewNfdWorker(args *Args) (NfdWorker, error) {
|
2020-04-21 19:40:01 +03:00
|
|
|
nfd := &nfdWorker{
|
2021-02-19 15:43:31 +02:00
|
|
|
args: *args,
|
2020-12-01 15:53:04 +02:00
|
|
|
config: &NFDConfig{},
|
|
|
|
realSources: []source.FeatureSource{
|
|
|
|
&cpu.Source{},
|
|
|
|
&iommu.Source{},
|
|
|
|
&kernel.Source{},
|
|
|
|
&memory.Source{},
|
|
|
|
&network.Source{},
|
|
|
|
&pci.Source{},
|
|
|
|
&storage.Source{},
|
|
|
|
&system.Source{},
|
|
|
|
&usb.Source{},
|
|
|
|
&custom.Source{},
|
|
|
|
// local needs to be the last source so that it is able to override
|
|
|
|
// labels from other sources
|
|
|
|
&local.Source{},
|
|
|
|
},
|
|
|
|
testSources: []source.FeatureSource{
|
|
|
|
&fake.Source{},
|
|
|
|
},
|
2021-02-11 21:38:13 +02:00
|
|
|
stop: make(chan struct{}, 1),
|
2020-04-21 19:40:01 +03:00
|
|
|
}
|
|
|
|
|
2020-11-27 10:19:31 +02:00
|
|
|
if args.ConfigFile != "" {
|
|
|
|
nfd.configFilePath = filepath.Clean(args.ConfigFile)
|
|
|
|
}
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
// Check TLS related args
|
|
|
|
if args.CertFile != "" || args.KeyFile != "" || args.CaFile != "" {
|
|
|
|
if args.CertFile == "" {
|
|
|
|
return nfd, fmt.Errorf("--cert-file needs to be specified alongside --key-file and --ca-file")
|
|
|
|
}
|
|
|
|
if args.KeyFile == "" {
|
|
|
|
return nfd, fmt.Errorf("--key-file needs to be specified alongside --cert-file and --ca-file")
|
|
|
|
}
|
|
|
|
if args.CaFile == "" {
|
|
|
|
return nfd, fmt.Errorf("--ca-file needs to be specified alongside --cert-file and --key-file")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nfd, nil
|
|
|
|
}
|
|
|
|
|
2020-11-27 08:26:22 +02:00
|
|
|
func addConfigWatch(path string) (*fsnotify.Watcher, map[string]struct{}, error) {
|
|
|
|
paths := make(map[string]struct{})
|
|
|
|
|
|
|
|
// Create watcher
|
|
|
|
w, err := fsnotify.NewWatcher()
|
|
|
|
if err != nil {
|
|
|
|
return w, paths, fmt.Errorf("failed to create fsnotify watcher: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add watches for all directory components so that we catch e.g. renames
|
|
|
|
// upper in the tree
|
|
|
|
added := false
|
|
|
|
for p := path; ; p = filepath.Dir(p) {
|
|
|
|
|
|
|
|
if err := w.Add(p); err != nil {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.V(1).Infof("failed to add fsnotify watch for %q: %v", p, err)
|
2020-11-27 08:26:22 +02:00
|
|
|
} else {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.V(1).Infof("added fsnotify watch %q", p)
|
2020-11-27 08:26:22 +02:00
|
|
|
added = true
|
|
|
|
}
|
|
|
|
|
|
|
|
paths[p] = struct{}{}
|
|
|
|
if filepath.Dir(p) == p {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !added {
|
|
|
|
// Want to be sure that we watch something
|
|
|
|
return w, paths, fmt.Errorf("failed to add any watch")
|
|
|
|
}
|
|
|
|
return w, paths, nil
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:19:31 +02:00
|
|
|
func newDefaultConfig() *NFDConfig {
|
|
|
|
return &NFDConfig{
|
2020-12-01 14:27:47 +02:00
|
|
|
Core: coreConfig{
|
2021-02-19 15:43:31 +02:00
|
|
|
LabelWhiteList: utils.RegexpVal{Regexp: *regexp.MustCompile("")},
|
2020-12-01 14:54:59 +02:00
|
|
|
SleepInterval: duration{60 * time.Second},
|
2020-12-01 15:53:04 +02:00
|
|
|
Sources: []string{"all"},
|
2021-02-23 20:42:17 +02:00
|
|
|
Klog: make(map[string]string),
|
2020-12-01 14:27:47 +02:00
|
|
|
},
|
2020-11-27 10:19:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
// Run NfdWorker client. Returns if a fatal error is encountered, or, after
|
|
|
|
// one request if OneShot is set to 'true' in the worker args.
|
|
|
|
func (w *nfdWorker) Run() error {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Infof("Node Feature Discovery Worker %s", version.Get())
|
|
|
|
klog.Infof("NodeName: '%s'", nodeName)
|
2019-02-08 21:43:54 +02:00
|
|
|
|
2020-11-27 10:19:31 +02:00
|
|
|
// Create watcher for config file and read initial configuration
|
|
|
|
configWatch, paths, err := addConfigWatch(w.configFilePath)
|
2019-08-27 23:27:40 +03:00
|
|
|
if err != nil {
|
2020-11-27 10:19:31 +02:00
|
|
|
return err
|
2019-08-27 23:27:40 +03:00
|
|
|
}
|
2020-11-30 17:23:28 +02:00
|
|
|
if err := w.configure(w.configFilePath, w.args.Options); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2019-08-27 23:27:40 +03:00
|
|
|
|
2020-11-27 10:19:31 +02:00
|
|
|
// Connect to NFD master
|
|
|
|
err = w.connect()
|
2020-11-27 08:26:22 +02:00
|
|
|
if err != nil {
|
2020-11-27 10:19:31 +02:00
|
|
|
return fmt.Errorf("failed to connect: %v", err)
|
2020-11-27 08:26:22 +02:00
|
|
|
}
|
2020-11-27 10:19:31 +02:00
|
|
|
defer w.disconnect()
|
2020-11-27 08:26:22 +02:00
|
|
|
|
|
|
|
labelTrigger := time.After(0)
|
|
|
|
var configTrigger <-chan time.Time
|
2019-08-27 23:27:40 +03:00
|
|
|
for {
|
2020-11-26 14:15:39 +02:00
|
|
|
select {
|
2020-11-27 08:26:22 +02:00
|
|
|
case <-labelTrigger:
|
2020-11-26 14:15:39 +02:00
|
|
|
// Get the set of feature labels.
|
2021-02-19 15:43:31 +02:00
|
|
|
labels := createFeatureLabels(w.enabledSources, w.config.Core.LabelWhiteList.Regexp)
|
2020-11-26 14:15:39 +02:00
|
|
|
|
|
|
|
// Update the node with the feature labels.
|
|
|
|
if w.client != nil {
|
|
|
|
err := advertiseFeatureLabels(w.client, labels)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to advertise labels: %s", err.Error())
|
|
|
|
}
|
2019-08-27 23:27:40 +03:00
|
|
|
}
|
|
|
|
|
2020-11-26 14:15:39 +02:00
|
|
|
if w.args.Oneshot {
|
|
|
|
return nil
|
|
|
|
}
|
2019-08-27 23:27:40 +03:00
|
|
|
|
2020-12-01 14:27:47 +02:00
|
|
|
if w.config.Core.SleepInterval.Duration > 0 {
|
|
|
|
labelTrigger = time.After(w.config.Core.SleepInterval.Duration)
|
2020-11-26 14:15:39 +02:00
|
|
|
}
|
2020-11-27 08:26:22 +02:00
|
|
|
|
|
|
|
case e := <-configWatch.Events:
|
|
|
|
name := filepath.Clean(e.Name)
|
|
|
|
|
|
|
|
// If any of our paths (directories or the file itself) change
|
|
|
|
if _, ok := paths[name]; ok {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Infof("fsnotify event in %q detected, reconfiguring fsnotify and reloading configuration", name)
|
2020-11-27 08:26:22 +02:00
|
|
|
|
|
|
|
// Blindly remove existing watch and add a new one
|
|
|
|
if err := configWatch.Close(); err != nil {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Warningf("failed to close fsnotify watcher: %v", err)
|
2020-11-27 08:26:22 +02:00
|
|
|
}
|
2020-11-27 10:19:31 +02:00
|
|
|
configWatch, paths, err = addConfigWatch(w.configFilePath)
|
2020-11-27 08:26:22 +02:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Rate limiter. In certain filesystem operations we get
|
|
|
|
// numerous events in quick succession and we only want one
|
|
|
|
// config re-load
|
|
|
|
configTrigger = time.After(time.Second)
|
|
|
|
}
|
|
|
|
|
|
|
|
case e := <-configWatch.Errors:
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Errorf("config file watcher error: %v", e)
|
2020-11-27 08:26:22 +02:00
|
|
|
|
|
|
|
case <-configTrigger:
|
2020-11-30 17:23:28 +02:00
|
|
|
if err := w.configure(w.configFilePath, w.args.Options); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-11-27 10:19:31 +02:00
|
|
|
// Manage connection to master
|
|
|
|
if w.config.Core.NoPublish {
|
|
|
|
w.disconnect()
|
|
|
|
} else if w.clientConn == nil {
|
|
|
|
if err := w.connect(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
2020-11-27 18:02:45 +02:00
|
|
|
// Always re-label after a re-config event. This way the new config
|
|
|
|
// comes into effect even if the sleep interval is long (or infinite)
|
|
|
|
labelTrigger = time.After(0)
|
2021-02-11 21:38:13 +02:00
|
|
|
|
|
|
|
case <-w.stop:
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Infof("shutting down nfd-worker")
|
2021-02-11 21:38:13 +02:00
|
|
|
configWatch.Close()
|
|
|
|
return nil
|
2019-08-27 23:27:40 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-11 21:38:13 +02:00
|
|
|
// Stop NfdWorker
|
|
|
|
func (w *nfdWorker) Stop() {
|
|
|
|
select {
|
|
|
|
case w.stop <- struct{}{}:
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-27 23:27:40 +03:00
|
|
|
// connect creates a client connection to the NFD master
|
|
|
|
func (w *nfdWorker) connect() error {
|
|
|
|
// Return a dummy connection in case of dry-run
|
2020-11-27 10:19:31 +02:00
|
|
|
if w.config.Core.NoPublish {
|
2019-08-27 23:27:40 +03:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that if a connection already exists
|
|
|
|
if w.clientConn != nil {
|
|
|
|
return fmt.Errorf("client connection already exists")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Dial and create a client
|
2020-05-19 15:07:31 +03:00
|
|
|
dialCtx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
|
|
|
defer cancel()
|
|
|
|
dialOpts := []grpc.DialOption{grpc.WithBlock()}
|
2019-02-08 21:43:54 +02:00
|
|
|
if w.args.CaFile != "" || w.args.CertFile != "" || w.args.KeyFile != "" {
|
|
|
|
// Load client cert for client authentication
|
|
|
|
cert, err := tls.LoadX509KeyPair(w.args.CertFile, w.args.KeyFile)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to load client certificate: %v", err)
|
|
|
|
}
|
|
|
|
// Load CA cert for server cert verification
|
|
|
|
caCert, err := ioutil.ReadFile(w.args.CaFile)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to read root certificate file: %v", err)
|
|
|
|
}
|
|
|
|
caPool := x509.NewCertPool()
|
|
|
|
if ok := caPool.AppendCertsFromPEM(caCert); !ok {
|
|
|
|
return fmt.Errorf("failed to add certificate from '%s'", w.args.CaFile)
|
|
|
|
}
|
|
|
|
// Create TLS config
|
|
|
|
tlsConfig := &tls.Config{
|
|
|
|
Certificates: []tls.Certificate{cert},
|
|
|
|
RootCAs: caPool,
|
|
|
|
ServerName: w.args.ServerNameOverride,
|
|
|
|
}
|
|
|
|
dialOpts = append(dialOpts, grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)))
|
|
|
|
} else {
|
|
|
|
dialOpts = append(dialOpts, grpc.WithInsecure())
|
|
|
|
}
|
2020-05-19 15:07:31 +03:00
|
|
|
conn, err := grpc.DialContext(dialCtx, w.args.Server, dialOpts...)
|
2019-02-08 21:43:54 +02:00
|
|
|
if err != nil {
|
2019-08-27 23:27:40 +03:00
|
|
|
return err
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
2019-08-27 23:27:40 +03:00
|
|
|
w.clientConn = conn
|
|
|
|
w.client = pb.NewLabelerClient(conn)
|
2019-02-08 21:43:54 +02:00
|
|
|
|
2019-08-27 23:27:40 +03:00
|
|
|
return nil
|
|
|
|
}
|
2019-02-08 21:43:54 +02:00
|
|
|
|
2019-08-27 23:27:40 +03:00
|
|
|
// disconnect closes the connection to NFD master
|
|
|
|
func (w *nfdWorker) disconnect() {
|
|
|
|
if w.clientConn != nil {
|
|
|
|
w.clientConn.Close()
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
2019-08-27 23:27:40 +03:00
|
|
|
w.clientConn = nil
|
|
|
|
w.client = nil
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
2020-12-01 14:27:47 +02:00
|
|
|
func (c *coreConfig) sanitize() {
|
|
|
|
if c.SleepInterval.Duration > 0 && c.SleepInterval.Duration < time.Second {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Warningf("too short sleep-intervall specified (%s), forcing to 1s",
|
2020-12-01 14:27:47 +02:00
|
|
|
c.SleepInterval.Duration.String())
|
|
|
|
c.SleepInterval = duration{time.Second}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-23 20:42:17 +02:00
|
|
|
func (w *nfdWorker) configureCore(c coreConfig) error {
|
|
|
|
// Handle klog
|
|
|
|
for k, a := range w.args.Klog {
|
|
|
|
if !a.IsSetFromCmdline() {
|
|
|
|
v, ok := c.Klog[k]
|
|
|
|
if !ok {
|
|
|
|
v = a.DefValue()
|
|
|
|
}
|
|
|
|
if err := a.SetFromConfig(v); err != nil {
|
2021-03-02 18:44:28 +02:00
|
|
|
return fmt.Errorf("failed to set logger option klog.%s = %v: %v", k, v, err)
|
2021-02-23 20:42:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for k := range c.Klog {
|
|
|
|
if _, ok := w.args.Klog[k]; !ok {
|
|
|
|
klog.Warningf("unknown logger option in config: %q", k)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Determine enabled feature sources
|
2020-12-01 15:53:04 +02:00
|
|
|
sourceList := map[string]struct{}{}
|
|
|
|
all := false
|
|
|
|
for _, s := range c.Sources {
|
|
|
|
if s == "all" {
|
|
|
|
all = true
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
sourceList[strings.TrimSpace(s)] = struct{}{}
|
|
|
|
}
|
|
|
|
|
|
|
|
w.enabledSources = []source.FeatureSource{}
|
|
|
|
for _, s := range w.realSources {
|
|
|
|
if _, enabled := sourceList[s.Name()]; all || enabled {
|
|
|
|
w.enabledSources = append(w.enabledSources, s)
|
|
|
|
delete(sourceList, s.Name())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for _, s := range w.testSources {
|
|
|
|
if _, enabled := sourceList[s.Name()]; enabled {
|
|
|
|
w.enabledSources = append(w.enabledSources, s)
|
|
|
|
delete(sourceList, s.Name())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(sourceList) > 0 {
|
|
|
|
names := make([]string, 0, len(sourceList))
|
|
|
|
for n := range sourceList {
|
|
|
|
names = append(names, n)
|
|
|
|
}
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Warningf("skipping unknown source(s) %q specified in core.sources (or --sources)", strings.Join(names, ", "))
|
2020-12-01 15:53:04 +02:00
|
|
|
}
|
2021-02-23 20:42:17 +02:00
|
|
|
return nil
|
2020-12-01 15:53:04 +02:00
|
|
|
}
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
// Parse configuration options
|
2020-11-30 17:23:28 +02:00
|
|
|
func (w *nfdWorker) configure(filepath string, overrides string) error {
|
2020-04-21 22:03:37 +03:00
|
|
|
// Create a new default config
|
2020-11-27 10:19:31 +02:00
|
|
|
c := newDefaultConfig()
|
2020-12-01 15:53:04 +02:00
|
|
|
allSources := append(w.realSources, w.testSources...)
|
|
|
|
c.Sources = make(map[string]source.Config, len(allSources))
|
|
|
|
for _, s := range allSources {
|
2020-04-21 22:03:37 +03:00
|
|
|
c.Sources[s.Name()] = s.NewConfig()
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
2020-04-21 22:03:37 +03:00
|
|
|
// Try to read and parse config file
|
2020-11-30 17:23:28 +02:00
|
|
|
if filepath != "" {
|
|
|
|
data, err := ioutil.ReadFile(filepath)
|
2020-04-21 22:03:37 +03:00
|
|
|
if err != nil {
|
2020-11-30 17:23:28 +02:00
|
|
|
if os.IsNotExist(err) {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Infof("config file %q not found, using defaults", filepath)
|
2020-11-30 17:23:28 +02:00
|
|
|
} else {
|
|
|
|
return fmt.Errorf("error reading config file: %s", err)
|
|
|
|
}
|
2020-04-21 22:03:37 +03:00
|
|
|
} else {
|
2020-11-30 17:23:28 +02:00
|
|
|
err = yaml.Unmarshal(data, c)
|
|
|
|
if err != nil {
|
2021-02-25 12:12:06 -05:00
|
|
|
return fmt.Errorf("failed to parse config file: %s", err)
|
2020-11-30 17:23:28 +02:00
|
|
|
}
|
2021-03-02 18:44:28 +02:00
|
|
|
klog.Infof("configuration file %q parsed", filepath)
|
2020-04-21 22:03:37 +03:00
|
|
|
}
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Parse config overrides
|
2020-11-30 17:23:28 +02:00
|
|
|
if err := yaml.Unmarshal([]byte(overrides), c); err != nil {
|
2021-02-25 12:12:06 -05:00
|
|
|
return fmt.Errorf("failed to parse --options: %s", err)
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
2021-02-19 15:43:31 +02:00
|
|
|
if w.args.Overrides.LabelWhiteList != nil {
|
|
|
|
c.Core.LabelWhiteList = *w.args.Overrides.LabelWhiteList
|
2020-12-01 14:54:59 +02:00
|
|
|
}
|
2021-02-19 15:43:31 +02:00
|
|
|
if w.args.Overrides.NoPublish != nil {
|
|
|
|
c.Core.NoPublish = *w.args.Overrides.NoPublish
|
2020-11-27 10:19:31 +02:00
|
|
|
}
|
2021-02-19 15:43:31 +02:00
|
|
|
if w.args.Overrides.SleepInterval != nil {
|
|
|
|
c.Core.SleepInterval = duration{*w.args.Overrides.SleepInterval}
|
2020-12-01 14:27:47 +02:00
|
|
|
}
|
2021-02-19 15:43:31 +02:00
|
|
|
if w.args.Overrides.Sources != nil {
|
|
|
|
c.Core.Sources = *w.args.Overrides.Sources
|
2020-12-01 15:53:04 +02:00
|
|
|
}
|
2020-12-01 14:27:47 +02:00
|
|
|
|
|
|
|
c.Core.sanitize()
|
2020-11-27 10:19:31 +02:00
|
|
|
|
2020-04-21 22:03:37 +03:00
|
|
|
w.config = c
|
|
|
|
|
2021-02-23 20:42:17 +02:00
|
|
|
if err := w.configureCore(c.Core); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-12-01 15:53:04 +02:00
|
|
|
|
|
|
|
// (Re-)configure all "real" sources, test sources are not configurable
|
|
|
|
for _, s := range allSources {
|
2020-04-21 22:03:37 +03:00
|
|
|
s.SetConfig(c.Sources[s.Name()])
|
|
|
|
}
|
2020-11-30 17:23:28 +02:00
|
|
|
|
2021-03-02 18:44:28 +02:00
|
|
|
klog.Infof("worker (re-)configuration successfully completed")
|
|
|
|
|
2020-11-30 17:23:28 +02:00
|
|
|
return nil
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// createFeatureLabels returns the set of feature labels from the enabled
|
|
|
|
// sources and the whitelist argument.
|
2021-02-19 15:43:31 +02:00
|
|
|
func createFeatureLabels(sources []source.FeatureSource, labelWhiteList regexp.Regexp) (labels Labels) {
|
2019-02-08 21:43:54 +02:00
|
|
|
labels = Labels{}
|
|
|
|
|
|
|
|
// Do feature discovery from all configured sources.
|
|
|
|
for _, source := range sources {
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
labelsFromSource, err := getFeatureLabels(source, labelWhiteList)
|
2019-02-08 21:43:54 +02:00
|
|
|
if err != nil {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Errorf("discovery failed for source %q: %v", source.Name(), err)
|
2019-02-08 21:43:54 +02:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, value := range labelsFromSource {
|
|
|
|
// Log discovered feature.
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Infof("%s = %s", name, value)
|
2019-02-08 21:43:54 +02:00
|
|
|
labels[name] = value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return labels
|
|
|
|
}
|
|
|
|
|
|
|
|
// getFeatureLabels returns node labels for features discovered by the
|
|
|
|
// supplied source.
|
2021-02-19 15:43:31 +02:00
|
|
|
func getFeatureLabels(source source.FeatureSource, labelWhiteList regexp.Regexp) (labels Labels, err error) {
|
2019-02-08 21:43:54 +02:00
|
|
|
labels = Labels{}
|
|
|
|
features, err := source.Discover()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
|
|
|
|
// Prefix for labels in the default namespace
|
|
|
|
prefix := source.Name() + "-"
|
|
|
|
switch source.(type) {
|
2020-04-21 22:03:37 +03:00
|
|
|
case *local.Source:
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
// Do not prefix labels from the hooks
|
|
|
|
prefix = ""
|
|
|
|
}
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
for k, v := range features {
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
// Split label name into namespace and name compoents. Use dummy 'ns'
|
|
|
|
// default namespace because there is no function to validate just
|
|
|
|
// the name part
|
|
|
|
split := strings.SplitN(k, "/", 2)
|
|
|
|
|
|
|
|
label := prefix + split[0]
|
|
|
|
nameForValidation := "ns/" + label
|
|
|
|
nameForWhiteListing := label
|
|
|
|
|
|
|
|
if len(split) == 2 {
|
|
|
|
label = k
|
|
|
|
nameForValidation = label
|
|
|
|
nameForWhiteListing = split[1]
|
2019-02-08 21:43:54 +02:00
|
|
|
}
|
|
|
|
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
// Validate label name.
|
|
|
|
errs := validation.IsQualifiedName(nameForValidation)
|
2019-02-08 21:43:54 +02:00
|
|
|
if len(errs) > 0 {
|
2021-02-25 12:12:06 -05:00
|
|
|
klog.Warningf("ignoring invalid feature name '%s': %s", label, errs)
|
2019-02-08 21:43:54 +02:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
value := fmt.Sprintf("%v", v)
|
|
|
|
// Validate label value
|
|
|
|
errs = validation.IsValidLabelValue(value)
|
|
|
|
if len(errs) > 0 {
|
2021-02-25 12:12:06 -05:00
|
|
|
klog.Warningf("ignoring invalid feature value %s=%s: %s", label, value, errs)
|
2019-02-08 21:43:54 +02:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
// Skip if label doesn't match labelWhiteList
|
|
|
|
if !labelWhiteList.MatchString(nameForWhiteListing) {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Infof("%q does not match the whitelist (%s) and will not be published.", nameForWhiteListing, labelWhiteList.String())
|
nfd-worker: fix --label-whitelist
Unify handling of --label-whitelist in nfd-worker and nfd-master. That is,
in nfd-worker, apply the regexp filter on non-namespaced part of the
label name.
Brief history:
1. Originally the whitelist regexp was applied on the full namespaced
label name (that would be e.g.
'feature.node.kubernetes.io/cpu-cpuid.AVX' in the current nfd version)
2. Commit 81752b2d changed the behavior so that the regexp was applied
on the non-namespaced part (that would be `cpu-cpuid.AVX`)
3. Commit 40918827 added support for custom label namespaces. With this
change, the label whitelist handling diverged between nfd-worker and
nfd-master. In nfd-master the whitelist regexp is always applied on
the non-namespaced label name. However, in nfd-worker the whitelist
handling is two-fold (and inconsistent): for labels in the standard
nfd namespace regexp is applied on the non-namespaced part (e.g.
`cpu-cpuid.AVX`, but, for labels in custom namespaces the regexp is
applied on the full name (e.g. `example.com/my-feature`).
This patch changes nfd-worker to behave similarly to nfd-master. The
namespace part is now always omitted, which should be easier for the
users to comprehend.
Also, fixes a bug in the label name prefixing so that the name of the
feature source is not prefixed into labels with custom label namespace
(effectively mangling the intended namespace). For example, previously a
'example.com/feature' label from the 'custom' feature source would be
prefixed with the source name, mangling it to
'custom-example.com/feature'.
2020-04-28 10:38:38 +03:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2019-02-08 21:43:54 +02:00
|
|
|
labels[label] = value
|
|
|
|
}
|
|
|
|
return labels, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// advertiseFeatureLabels advertises the feature labels to a Kubernetes node
|
|
|
|
// via the NFD server.
|
|
|
|
func advertiseFeatureLabels(client pb.LabelerClient, labels Labels) error {
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
|
|
defer cancel()
|
|
|
|
|
2021-02-25 12:12:06 -05:00
|
|
|
klog.Infof("sending labeling request to nfd-master")
|
2019-02-08 21:43:54 +02:00
|
|
|
|
|
|
|
labelReq := pb.SetLabelsRequest{Labels: labels,
|
|
|
|
NfdVersion: version.Get(),
|
|
|
|
NodeName: nodeName}
|
|
|
|
_, err := client.SetLabels(ctx, &labelReq)
|
|
|
|
if err != nil {
|
2021-02-23 10:05:13 +02:00
|
|
|
klog.Errorf("failed to set node labels: %v", err)
|
2019-02-08 21:43:54 +02:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
2020-04-21 22:03:37 +03:00
|
|
|
|
2020-12-01 14:27:47 +02:00
|
|
|
// UnmarshalJSON implements the Unmarshaler interface from "encoding/json"
|
|
|
|
func (d *duration) UnmarshalJSON(data []byte) error {
|
|
|
|
var v interface{}
|
|
|
|
if err := json.Unmarshal(data, &v); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
switch val := v.(type) {
|
|
|
|
case float64:
|
|
|
|
d.Duration = time.Duration(val)
|
|
|
|
case string:
|
|
|
|
var err error
|
|
|
|
d.Duration, err = time.ParseDuration(val)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return fmt.Errorf("invalid duration %s", data)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2020-04-21 22:03:37 +03:00
|
|
|
// UnmarshalJSON implements the Unmarshaler interface from "encoding/json"
|
|
|
|
func (c *sourcesConfig) UnmarshalJSON(data []byte) error {
|
|
|
|
// First do a raw parse to get the per-source data
|
|
|
|
raw := map[string]json.RawMessage{}
|
|
|
|
err := yaml.Unmarshal(data, &raw)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Then parse each source-specific data structure
|
|
|
|
// NOTE: we expect 'c' to be pre-populated with correct per-source data
|
|
|
|
// types. Non-pre-populated keys are ignored.
|
|
|
|
for k, rawv := range raw {
|
|
|
|
if v, ok := (*c)[k]; ok {
|
|
|
|
err := yaml.Unmarshal(rawv, &v)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("failed to parse %q source config: %v", k, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|