github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-01 18:47:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Move ResourceLabels and NodeSelectorTerms fields into TapConfig

Browse Source
This commit is contained in:
M. Mert Yildiran
2023-04-11 22:37:29 +03:00
parent 0aedc023aa
commit 02990912b7
4 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kubernetes/provider.go
View File

@@ -280,11 +280,11 @@ func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
},
}
if len(config.Config.NodeSelectorTerms) > 0 {
if len(config.Config.Tap.NodeSelectorTerms) > 0 {
pod.Spec.Affinity = &core.Affinity{
NodeAffinity: &core.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
NodeSelectorTerms: config.Config.NodeSelectorTerms,
NodeSelectorTerms: config.Config.Tap.NodeSelectorTerms,
},
},
}
@@ -390,11 +390,11 @@ func (provider *Provider) BuildFrontPod(opts *PodOptions, hubHost string, hubPor
},
}
if len(config.Config.NodeSelectorTerms) > 0 {
if len(config.Config.Tap.NodeSelectorTerms) > 0 {
pod.Spec.Affinity = &core.Affinity{
NodeAffinity: &core.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
NodeSelectorTerms: config.Config.NodeSelectorTerms,
NodeSelectorTerms: config.Config.Tap.NodeSelectorTerms,
},
},
}
@@ -849,11 +849,11 @@ func (provider *Provider) BuildWorkerDaemonSet(
},
}
if len(config.Config.NodeSelectorTerms) > 0 {
if len(config.Config.Tap.NodeSelectorTerms) > 0 {
pod.Spec.Affinity = &core.Affinity{
NodeAffinity: &core.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
NodeSelectorTerms: config.Config.NodeSelectorTerms,
NodeSelectorTerms: config.Config.Tap.NodeSelectorTerms,
},
},
}

2
kubernetes/utils.go
View File

@@ -8,7 +8,7 @@ func buildWithDefaultLabels(labels map[string]string, provider *Provider) map[st
labels[LabelManagedBy] = provider.managedBy
labels[LabelCreatedBy] = provider.createdBy
for k, v := range config.Config.ResourceLabels {
for k, v := range config.Config.Tap.ResourceLabels {
labels[k] = v
}