⏪ Bring back the functionality of resourcelabels field into the Helm chart

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"`

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: {}

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 }}'

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

helm-chart/values.yaml

@@ -41,7 +41,7 @@ tap:
   tls: true
   packetcapture: libpcap
   ignoretainted: false
-  resourceLabels: {}
+  resourcelabels: {}
   nodeSelectorTerms: []
   ingress:
     enabled: false