github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-07-20 19:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Add TelemetryConfig struct and --telemetry-enabled flag to tap command

Browse Source
This commit is contained in:
M. Mert Yildiran 2023-08-31 03:50:14 +03:00
parent bf182b6330
commit fa1e7bcf01
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
6 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/tap.go
View File

@ -61,4 +61,5 @@ func init() {
tapCmd.Flags().Bool(configStructs.TlsLabel, defaultTapConfig.Tls, "Capture the traffic that's encrypted with OpenSSL or Go crypto/tls libraries") tapCmd.Flags().Bool(configStructs.TlsLabel, defaultTapConfig.Tls, "Capture the traffic that's encrypted with OpenSSL or Go crypto/tls libraries")
tapCmd.Flags().Bool(configStructs.IgnoreTaintedLabel, defaultTapConfig.IgnoreTainted, "Ignore tainted pods while running Worker DaemonSet") tapCmd.Flags().Bool(configStructs.IgnoreTaintedLabel, defaultTapConfig.IgnoreTainted, "Ignore tainted pods while running Worker DaemonSet")
tapCmd.Flags().Bool(configStructs.IngressEnabledLabel, defaultTapConfig.Ingress.Enabled, "Enable Ingress") tapCmd.Flags().Bool(configStructs.IngressEnabledLabel, defaultTapConfig.Ingress.Enabled, "Enable Ingress")
tapCmd.Flags().Bool(configStructs.TelemetryEnabledLabel, defaultTapConfig.Telemetry.Enabled, "Enable/disable Telemetry")
} }

5
cmd/tapRunner.go
View File

@ -77,6 +77,11 @@ func tap() {
state.targetNamespaces = kubernetesProvider.GetNamespaces() state.targetNamespaces = kubernetesProvider.GetNamespaces()
log.Info().
Bool("enabled", config.Config.Tap.Telemetry.Enabled).
Str("notice", "Telemetry can be disabled by setting the flag: --telemetry-enabled=false").
Msg("Telemetry")
log.Info().Strs("namespaces", state.targetNamespaces).Msg("Targeting pods in:") log.Info().Strs("namespaces", state.targetNamespaces).Msg("Targeting pods in:")
if err := printTargetedPodsPreview(ctx, kubernetesProvider, state.targetNamespaces); err != nil { if err := printTargetedPodsPreview(ctx, kubernetesProvider, state.targetNamespaces); err != nil {

6
config/configStructs/tapConfig.go
View File

@ -27,6 +27,7 @@ const (
TlsLabel = "tls" TlsLabel = "tls"
IgnoreTaintedLabel = "ignoretainted" IgnoreTaintedLabel = "ignoretainted"
IngressEnabledLabel = "ingress-enabled" IngressEnabledLabel = "ingress-enabled"
TelemetryEnabledLabel = "telemetry-enabled"
DebugLabel = "debug" DebugLabel = "debug"
ContainerPort = 80 ContainerPort = 80
ContainerPortStr = "80" ContainerPortStr = "80"
@ -100,6 +101,10 @@ type ReleaseConfig struct {
Namespace string `yaml:"namespace" json:"namespace" default:"default"` Namespace string `yaml:"namespace" json:"namespace" default:"default"`
} }
type TelemetryConfig struct {
Enabled bool `yaml:"enabled" json:"enabled" default:"true"`
}
type TapConfig struct { type TapConfig struct {
Docker DockerConfig `yaml:"docker" json:"docker"` Docker DockerConfig `yaml:"docker" json:"docker"`
Proxy ProxyConfig `yaml:"proxy" json:"proxy"` Proxy ProxyConfig `yaml:"proxy" json:"proxy"`
@ -123,6 +128,7 @@ type TapConfig struct {
Ingress IngressConfig `yaml:"ingress" json:"ingress"` Ingress IngressConfig `yaml:"ingress" json:"ingress"`
IPv6 bool `yaml:"ipv6" json:"ipv6" default:"true"` IPv6 bool `yaml:"ipv6" json:"ipv6" default:"true"`
Debug bool `yaml:"debug" json:"debug" default:"false"` Debug bool `yaml:"debug" json:"debug" default:"false"`
Telemetry TelemetryConfig `yaml:"telemetry" json:"telemetry"`
} }
func (config *TapConfig) PodRegex() *regexp.Regexp { func (config *TapConfig) PodRegex() *regexp.Regexp {

1
helm-chart/templates/13-config-map.yaml
View File

@ -14,3 +14,4 @@ data:
AUTH_ENABLED: '{{ .Values.tap.auth.enabled | ternary "true" "" }}' AUTH_ENABLED: '{{ .Values.tap.auth.enabled | ternary "true" "" }}'
AUTH_APPROVED_EMAILS: '{{ gt (len .Values.tap.auth.approvedemails) 0 | ternary (join "," .Values.tap.auth.approvedemails) "" }}' AUTH_APPROVED_EMAILS: '{{ gt (len .Values.tap.auth.approvedemails) 0 | ternary (join "," .Values.tap.auth.approvedemails) "" }}'
AUTH_APPROVED_DOMAINS: '{{ gt (len .Values.tap.auth.approveddomains) 0 | ternary (join "," .Values.tap.auth.approveddomains) "" }}' AUTH_APPROVED_DOMAINS: '{{ gt (len .Values.tap.auth.approveddomains) 0 | ternary (join "," .Values.tap.auth.approveddomains) "" }}'
TELEMETRY_DISABLED: '{{ not .Values.tap.telemetry.enabled | ternary "true" "" }}'

2
helm-chart/values.yaml
View File

@ -78,4 +78,6 @@ tap:
servicemesh: true servicemesh: true
storageclass: standard storageclass: standard
storagelimit: 200Mi storagelimit: 200Mi
telemetry:
enabled: true
tls: true tls: true

1
manifests/complete.yaml
View File

@ -80,6 +80,7 @@ data:
AUTH_ENABLED: '' AUTH_ENABLED: ''
AUTH_APPROVED_EMAILS: '' AUTH_APPROVED_EMAILS: ''
AUTH_APPROVED_DOMAINS: '' AUTH_APPROVED_DOMAINS: ''
TELEMETRY_DISABLED: ''
--- ---
# Source: kubeshark/templates/02-cluster-role.yaml # Source: kubeshark/templates/02-cluster-role.yaml
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1