Skip to content

Commit 4e9fcb3

Browse files
pass object by pointers
1 parent 5107dd2 commit 4e9fcb3

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

pkg/pipeline/transform/kubernetes/datasource/datasource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type Datasource struct {
1313

1414
func NewInformerDatasource(kubeconfig string, infConfig *informers.Config, opMetrics *operational.Metrics) (*Datasource, error) {
1515
inf := &informers.Informers{}
16-
if err := inf.InitFromConfig(kubeconfig, *infConfig, opMetrics); err != nil {
16+
if err := inf.InitFromConfig(kubeconfig, infConfig, opMetrics); err != nil {
1717
return nil, err
1818
}
1919
return &Datasource{Informers: inf}, nil

pkg/pipeline/transform/kubernetes/enrich.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ var infConfig informers.Config
1717

1818
// For testing
1919
func MockInformers() {
20-
infConfig = informers.NewConfig(api.NetworkTransformKubeConfig{})
20+
infConfig = informers.NewConfig(&api.NetworkTransformKubeConfig{})
2121
ds = &datasource.Datasource{Informers: informers.NewInformersMock()}
2222
}
2323

2424
func InitInformerDatasource(config *api.NetworkTransformKubeConfig, opMetrics *operational.Metrics) error {
2525
var err error
26-
infConfig = informers.NewConfig(*config)
26+
infConfig = informers.NewConfig(config)
2727
if ds == nil {
2828
ds, err = datasource.NewInformerDatasource(config.ConfigPath, &infConfig, opMetrics)
2929
}

pkg/pipeline/transform/kubernetes/informers/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Config struct {
2222
trackedKinds []string
2323
}
2424

25-
func NewConfig(cfg api.NetworkTransformKubeConfig) Config {
25+
func NewConfig(cfg *api.NetworkTransformKubeConfig) Config {
2626
c := Config{
2727
managedCNI: cfg.ManagedCNI,
2828
secondaryNetworks: cfg.SecondaryNetworks,

pkg/pipeline/transform/kubernetes/informers/informers-mock.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func NewInformersMock() *Mock {
3636
return inf
3737
}
3838

39-
func (o *Mock) InitFromConfig(kubeconfig string, infConfig Config, opMetrics *operational.Metrics) error {
39+
func (o *Mock) InitFromConfig(kubeconfig string, infConfig *Config, opMetrics *operational.Metrics) error {
4040
args := o.Called(kubeconfig, infConfig, opMetrics)
4141
return args.Error(0)
4242
}
@@ -249,15 +249,15 @@ type FakeInformers struct {
249249
}
250250

251251
func SetupStubs(ipInfo, customKeysInfo, nodes map[string]*model.ResourceMetaData) (Config, *FakeInformers) {
252-
cfg := NewConfig(api.NetworkTransformKubeConfig{SecondaryNetworks: secondaryNetConfig})
252+
cfg := NewConfig(&api.NetworkTransformKubeConfig{SecondaryNetworks: secondaryNetConfig})
253253
return cfg, &FakeInformers{
254254
ipInfo: ipInfo,
255255
customKeysInfo: customKeysInfo,
256256
nodes: nodes,
257257
}
258258
}
259259

260-
func (f *FakeInformers) InitFromConfig(_ string, _ Config, _ *operational.Metrics) error {
260+
func (f *FakeInformers) InitFromConfig(_ string, _ *Config, _ *operational.Metrics) error {
261261
return nil
262262
}
263263

pkg/pipeline/transform/kubernetes/informers/informers.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ func (k *Informers) getHostName(hostIP string) string {
316316
return ""
317317
}
318318

319-
func (k *Informers) initNodeInformer(informerFactory inf.SharedInformerFactory, cfg Config) error {
319+
func (k *Informers) initNodeInformer(informerFactory inf.SharedInformerFactory, cfg *Config) error {
320320
nodes := informerFactory.Core().V1().Nodes().Informer()
321321
// Transform any *v1.Node instance into a *Info instance to save space
322322
// in the informer's cache
@@ -368,7 +368,7 @@ func (k *Informers) initNodeInformer(informerFactory inf.SharedInformerFactory,
368368
return nil
369369
}
370370

371-
func (k *Informers) initPodInformer(informerFactory inf.SharedInformerFactory, cfg Config, dynClient *dynamic.DynamicClient) error {
371+
func (k *Informers) initPodInformer(informerFactory inf.SharedInformerFactory, cfg *Config, dynClient *dynamic.DynamicClient) error {
372372
pods := informerFactory.Core().V1().Pods().Informer()
373373
// Transform any *v1.Pod instance into a *Info instance to save space
374374
// in the informer's cache
@@ -582,9 +582,9 @@ func (k *Informers) initVirtualMachineInformer(informerFactory metadatainformer.
582582
return nil
583583
}
584584

585-
func (k *Informers) InitFromConfig(kubeconfig string, infConfig Config, opMetrics *operational.Metrics) error {
585+
func (k *Informers) InitFromConfig(kubeconfig string, infConfig *Config, opMetrics *operational.Metrics) error {
586586
// Initialization variables
587-
k.config = infConfig
587+
k.config = *infConfig
588588
k.stopChan = make(chan struct{})
589589
k.mdStopChan = make(chan struct{})
590590

@@ -617,7 +617,7 @@ func (k *Informers) InitFromConfig(kubeconfig string, infConfig Config, opMetric
617617
return nil
618618
}
619619

620-
func (k *Informers) initInformers(client kubernetes.Interface, metaClient metadata.Interface, dynClient *dynamic.DynamicClient, cfg Config) error {
620+
func (k *Informers) initInformers(client kubernetes.Interface, metaClient metadata.Interface, dynClient *dynamic.DynamicClient, cfg *Config) error {
621621
informerFactory := inf.NewSharedInformerFactory(client, syncTime)
622622
metadataInformerFactory := metadatainformer.NewSharedInformerFactory(metaClient, syncTime)
623623
err := k.initNodeInformer(informerFactory, cfg)

0 commit comments

Comments
 (0)