github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-07-04 20:08:38 +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
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
4 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/configStruct.go
View File

@ -36,8 +36,6 @@ type ConfigStruct struct {
HeadlessMode bool `yaml:"headless" default:"false"` HeadlessMode bool `yaml:"headless" default:"false"`
License string `yaml:"license" default:""` License string `yaml:"license" default:""`
Scripting configStructs.ScriptingConfig `yaml:"scripting"` Scripting configStructs.ScriptingConfig `yaml:"scripting"`
ResourceLabels map[string]string `yaml:"resourceLabels" default:"{}"`
NodeSelectorTerms []v1.NodeSelectorTerm `yaml:"nodeSelectorTerms" default:"[]"`
Manifests ManifestsConfig `yaml:"manifests,omitempty"` Manifests ManifestsConfig `yaml:"manifests,omitempty"`
} }

3
config/configStructs/tapConfig.go
View File

@ -6,6 +6,7 @@ import (
"github.com/kubeshark/kubeshark/utils" "github.com/kubeshark/kubeshark/utils"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
v1 "k8s.io/api/core/v1"
) )
const ( const (
@ -84,6 +85,8 @@ type TapConfig struct {
Tls bool `yaml:"tls" default:"true"` Tls bool `yaml:"tls" default:"true"`
PacketCapture string `yaml:"packetcapture" default:"libpcap"` PacketCapture string `yaml:"packetcapture" default:"libpcap"`
IgnoreTainted bool `yaml:"ignoreTainted" default:"false"` IgnoreTainted bool `yaml:"ignoreTainted" default:"false"`
ResourceLabels map[string]string `yaml:"resourceLabels" default:"{}"`
NodeSelectorTerms []v1.NodeSelectorTerm `yaml:"nodeSelectorTerms" default:"[]"`
Debug bool `yaml:"debug" default:"false"` Debug bool `yaml:"debug" default:"false"`
} }

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{ pod.Spec.Affinity = &core.Affinity{
NodeAffinity: &core.NodeAffinity{ NodeAffinity: &core.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{ 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{ pod.Spec.Affinity = &core.Affinity{
NodeAffinity: &core.NodeAffinity{ NodeAffinity: &core.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{ 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{ pod.Spec.Affinity = &core.Affinity{
NodeAffinity: &core.NodeAffinity{ NodeAffinity: &core.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{ 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[LabelManagedBy] = provider.managedBy
labels[LabelCreatedBy] = provider.createdBy labels[LabelCreatedBy] = provider.createdBy
for k, v := range config.Config.ResourceLabels { for k, v := range config.Config.Tap.ResourceLabels {
labels[k] = v labels[k] = v
} }