From 16f1e116c01c75f1c002e78d7b76fb132101274a Mon Sep 17 00:00:00 2001
From: "M. Mert Yildiran" <me@mertyildiran.com>
Date: Tue, 27 Jun 2023 03:45:47 +0300
Subject: [PATCH] :zap: Template the annotations in all resources

---
 config/configStructs/tapConfig.go                    | 1 +
 helm-chart/templates/00-namespace.yaml               | 4 ++++
 helm-chart/templates/01-service-account.yaml         | 4 ++++
 helm-chart/templates/02-cluster-role.yaml            | 4 ++++
 helm-chart/templates/03-cluster-role-binding.yaml    | 4 ++++
 helm-chart/templates/04-hub-pod.yaml                 | 4 ++++
 helm-chart/templates/05-hub-service.yaml             | 4 ++++
 helm-chart/templates/06-front-pod.yaml               | 4 ++++
 helm-chart/templates/07-front-service.yaml           | 4 ++++
 helm-chart/templates/08-persistent-volume-claim.yaml | 4 ++++
 helm-chart/templates/09-worker-daemon-set.yaml       | 4 ++++
 helm-chart/templates/10-ingress-class.yaml           | 4 ++++
 helm-chart/templates/11-ingress.yaml                 | 4 ++++
 helm-chart/values.yaml                               | 1 +
 14 files changed, 50 insertions(+)

diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go
index c636c80a8..85339f55f 100644
--- a/config/configStructs/tapConfig.go
+++ b/config/configStructs/tapConfig.go
@@ -111,6 +111,7 @@ type TapConfig struct {
 	PacketCapture     string                `yaml:"packetcapture" json:"packetcapture" default:"libpcap"`
 	IgnoreTainted     bool                  `yaml:"ignoretainted" json:"ignoretainted" default:"false"`
 	Labels            map[string]string     `yaml:"labels" json:"labels" default:"{}"`
+	Annotations       map[string]string     `yaml:"annotations" json:"annotations" 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 c9e2ef99c..3456fba20 100644
--- a/helm-chart/templates/00-namespace.yaml
+++ b/helm-chart/templates/00-namespace.yaml
@@ -7,6 +7,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 aa54079a3..a2979f61d 100644
--- a/helm-chart/templates/01-service-account.yaml
+++ b/helm-chart/templates/01-service-account.yaml
@@ -7,5 +7,9 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 967827556..c1d97b604 100644
--- a/helm-chart/templates/02-cluster-role.yaml
+++ b/helm-chart/templates/02-cluster-role.yaml
@@ -7,6 +7,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 3a02116e3..58cdc81d5 100644
--- a/helm-chart/templates/03-cluster-role-binding.yaml
+++ b/helm-chart/templates/03-cluster-role-binding.yaml
@@ -7,6 +7,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 c76565873..f6d8edecb 100644
--- a/helm-chart/templates/04-hub-pod.yaml
+++ b/helm-chart/templates/04-hub-pod.yaml
@@ -8,6 +8,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 71a254fe9..31c2e11a1 100644
--- a/helm-chart/templates/05-hub-service.yaml
+++ b/helm-chart/templates/05-hub-service.yaml
@@ -7,6 +7,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 47b87cd76..5d1c41f19 100644
--- a/helm-chart/templates/06-front-pod.yaml
+++ b/helm-chart/templates/06-front-pod.yaml
@@ -8,6 +8,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 4bf68b208..b5de960cf 100644
--- a/helm-chart/templates/07-front-service.yaml
+++ b/helm-chart/templates/07-front-service.yaml
@@ -7,6 +7,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 71eb09ec5..acdcd384d 100644
--- a/helm-chart/templates/08-persistent-volume-claim.yaml
+++ b/helm-chart/templates/08-persistent-volume-claim.yaml
@@ -8,6 +8,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 fd8e81466..90cf8fea8 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -8,6 +8,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- end }}
   name: kubeshark-worker-daemon-set
   namespace: {{ .Values.tap.selfnamespace }}
 spec:
diff --git a/helm-chart/templates/10-ingress-class.yaml b/helm-chart/templates/10-ingress-class.yaml
index 342066c42..e591d8ca5 100644
--- a/helm-chart/templates/10-ingress-class.yaml
+++ b/helm-chart/templates/10-ingress-class.yaml
@@ -8,6 +8,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- 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 6e79b2eaf..7fb13e0f1 100644
--- a/helm-chart/templates/11-ingress.yaml
+++ b/helm-chart/templates/11-ingress.yaml
@@ -11,6 +11,10 @@ metadata:
   {{- if .Values.tap.labels }}
     {{- toYaml .Values.tap.labels | nindent 4 }}
   {{- end }}
+  annotations:
+  {{- if .Values.tap.annotations }}
+    {{- toYaml .Values.tap.annotations | nindent 4 }}
+  {{- end }}
   name: kubeshark-ingress
   namespace: {{ .Values.tap.selfnamespace }}
 spec:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index 00932c32e..82878c585 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -42,6 +42,7 @@ tap:
   packetcapture: libpcap
   ignoretainted: false
   labels: {}
+  annotations: {}
   nodeselectorterms: []
   ingress:
     enabled: false