From 5c4c913a279ad6bd9d62331e1d465f66e9853a1e Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Tue, 27 Jun 2023 01:12:04 +0300 Subject: [PATCH] :rewind: Bring back the functionality of `resourcelabels` field into the Helm chart --- config/configStructs/tapConfig.go | 2 +- helm-chart/templates/00-namespace.yaml | 4 ++++ helm-chart/templates/01-service-account.yaml | 3 +++ helm-chart/templates/02-cluster-role.yaml | 3 +++ helm-chart/templates/03-cluster-role-binding.yaml | 3 +++ helm-chart/templates/04-hub-pod.yaml | 3 +++ helm-chart/templates/05-hub-service.yaml | 4 ++++ helm-chart/templates/06-front-pod.yaml | 3 +++ helm-chart/templates/07-front-service.yaml | 4 ++++ helm-chart/templates/08-persistent-volume-claim.yaml | 3 +++ helm-chart/templates/09-worker-daemon-set.yaml | 10 ++++++++++ helm-chart/templates/10-ingress-class.yaml | 3 +++ helm-chart/templates/11-ingress.yaml | 3 +++ helm-chart/values.yaml | 2 +- 14 files changed, 48 insertions(+), 2 deletions(-) diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index 3c58fb5d4..ebf824ff2 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -108,7 +108,7 @@ type TapConfig struct { Tls bool `yaml:"tls" json:"tls" default:"true"` PacketCapture string `yaml:"packetcapture" json:"packetcapture" default:"libpcap"` IgnoreTainted bool `yaml:"ignoretainted" json:"ignoretainted" default:"false"` - ResourceLabels map[string]string `yaml:"resourceLabels" json:"resourceLabels" default:"{}"` + ResourceLabels map[string]string `yaml:"resourcelabels" json:"resourcelabels" default:"{}"` NodeSelectorTerms []v1.NodeSelectorTerm `yaml:"nodeSelectorTerms" json:"nodeSelectorTerms" default:"[]"` Ingress IngressConfig `yaml:"ingress" json:"ingress"` Debug bool `yaml:"debug" json:"debug" default:"false"` diff --git a/helm-chart/templates/00-namespace.yaml b/helm-chart/templates/00-namespace.yaml index b470f5bc0..a4e3917b4 100644 --- a/helm-chart/templates/00-namespace.yaml +++ b/helm-chart/templates/00-namespace.yaml @@ -4,8 +4,12 @@ kind: Namespace metadata: creationTimestamp: null labels: + kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: '{{ .Values.tap.selfnamespace }}' spec: {} status: {} diff --git a/helm-chart/templates/01-service-account.yaml b/helm-chart/templates/01-service-account.yaml index 7b43ff49a..35166bae9 100644 --- a/helm-chart/templates/01-service-account.yaml +++ b/helm-chart/templates/01-service-account.yaml @@ -7,5 +7,8 @@ metadata: kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-service-account namespace: '{{ .Values.tap.selfnamespace }}' diff --git a/helm-chart/templates/02-cluster-role.yaml b/helm-chart/templates/02-cluster-role.yaml index 0eb2d8258..8de5b935a 100644 --- a/helm-chart/templates/02-cluster-role.yaml +++ b/helm-chart/templates/02-cluster-role.yaml @@ -7,6 +7,9 @@ metadata: kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-cluster-role namespace: '{{ .Values.tap.selfnamespace }}' rules: diff --git a/helm-chart/templates/03-cluster-role-binding.yaml b/helm-chart/templates/03-cluster-role-binding.yaml index 6fa56df9f..14559ba65 100644 --- a/helm-chart/templates/03-cluster-role-binding.yaml +++ b/helm-chart/templates/03-cluster-role-binding.yaml @@ -7,6 +7,9 @@ metadata: kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-cluster-role-binding namespace: '{{ .Values.tap.selfnamespace }}' roleRef: diff --git a/helm-chart/templates/04-hub-pod.yaml b/helm-chart/templates/04-hub-pod.yaml index c0a423bf6..47b490f2f 100644 --- a/helm-chart/templates/04-hub-pod.yaml +++ b/helm-chart/templates/04-hub-pod.yaml @@ -7,6 +7,9 @@ metadata: app: kubeshark-hub kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-hub namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/templates/05-hub-service.yaml b/helm-chart/templates/05-hub-service.yaml index a7448552b..1c0efc27b 100644 --- a/helm-chart/templates/05-hub-service.yaml +++ b/helm-chart/templates/05-hub-service.yaml @@ -4,8 +4,12 @@ kind: Service metadata: creationTimestamp: null labels: + kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-hub namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/templates/06-front-pod.yaml b/helm-chart/templates/06-front-pod.yaml index e38ba95bd..c4544f61d 100644 --- a/helm-chart/templates/06-front-pod.yaml +++ b/helm-chart/templates/06-front-pod.yaml @@ -7,6 +7,9 @@ metadata: app: kubeshark-front kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-front namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/templates/07-front-service.yaml b/helm-chart/templates/07-front-service.yaml index a2cc2f2ab..718f92bae 100644 --- a/helm-chart/templates/07-front-service.yaml +++ b/helm-chart/templates/07-front-service.yaml @@ -4,8 +4,12 @@ kind: Service metadata: creationTimestamp: null labels: + kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-front namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/templates/08-persistent-volume-claim.yaml b/helm-chart/templates/08-persistent-volume-claim.yaml index e141456ef..19d4505c9 100644 --- a/helm-chart/templates/08-persistent-volume-claim.yaml +++ b/helm-chart/templates/08-persistent-volume-claim.yaml @@ -8,6 +8,9 @@ metadata: kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-persistent-volume-claim namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml index cfc6a21c2..fe719b98f 100644 --- a/helm-chart/templates/09-worker-daemon-set.yaml +++ b/helm-chart/templates/09-worker-daemon-set.yaml @@ -5,8 +5,12 @@ metadata: creationTimestamp: null labels: app: kubeshark-worker-daemon-set + kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-worker-daemon-set namespace: '{{ .Values.tap.selfnamespace }}' spec: @@ -15,6 +19,9 @@ spec: app: kubeshark-worker-daemon-set kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} template: metadata: creationTimestamp: null @@ -22,6 +29,9 @@ spec: app: kubeshark-worker-daemon-set kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-worker-daemon-set namespace: kubeshark spec: diff --git a/helm-chart/templates/10-ingress-class.yaml b/helm-chart/templates/10-ingress-class.yaml index 268c7e9d0..2926b0d13 100644 --- a/helm-chart/templates/10-ingress-class.yaml +++ b/helm-chart/templates/10-ingress-class.yaml @@ -8,6 +8,9 @@ metadata: kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-ingress-class namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/templates/11-ingress.yaml b/helm-chart/templates/11-ingress.yaml index 83b3f7737..bb36f5951 100644 --- a/helm-chart/templates/11-ingress.yaml +++ b/helm-chart/templates/11-ingress.yaml @@ -11,6 +11,9 @@ metadata: kubeshark-cli-version: v1 kubeshark-created-by: kubeshark kubeshark-managed-by: kubeshark + {{- range $key, $value := .Values.tap.resourcelabels }} + {{ $key }}: {{ $value }} + {{- end }} name: kubeshark-ingress namespace: '{{ .Values.tap.selfnamespace }}' spec: diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 544c38a24..5d62e6910 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -41,7 +41,7 @@ tap: tls: true packetcapture: libpcap ignoretainted: false - resourceLabels: {} + resourcelabels: {} nodeSelectorTerms: [] ingress: enabled: false