✨ Generate Helm chart templates

cmd/helmChart.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -10,6 +11,8 @@ import (
 	"github.com/kubeshark/kubeshark/kubernetes"
 	"github.com/kubeshark/kubeshark/misc"
 	"github.com/kubeshark/kubeshark/utils"
+	"github.com/ohler55/ojg/jp"
+	"github.com/ohler55/ojg/oj"
 	"github.com/otiai10/copy"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -105,6 +108,59 @@ type Dependency struct {
 	Alias string `json:"alias,omitempty"`
 }
 
+var namespaceMappings = map[string]interface{}{
+	"metadata.name": "{{ .Values.tap.selfnamespace }}",
+}
+var serviceAccountMappings = namespaceMappings
+var clusterRoleMappings = namespaceMappings
+var clusterRoleBindingMappings = map[string]interface{}{
+	"metadata.name":         "{{ .Values.tap.selfnamespace }}",
+	"subjects[0].namespace": "{{ .Values.tap.selfnamespace }}",
+}
+var hubPodMappings = map[string]interface{}{
+	"metadata.name": "{{ .Values.tap.selfnamespace }}",
+	"spec.containers[0].env": []map[string]interface{}{
+		{
+			"name":  "POD_REGEX",
+			"value": "{{ .Values.tap.regex }}",
+		},
+		{
+			"name":  "NAMESPACES",
+			"value": "{{ .Values.tap.namespaces }}",
+		},
+		{
+			"name":  "STORAGE_LIMIT",
+			"value": "{{ .Values.tap.storagelimit }}",
+		},
+		{
+			"name":  "LICENSE",
+			"value": "{{ .Values.license }}",
+		},
+	},
+	"spec.containers[0].image":                     "{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.tag }}",
+	"spec.containers[0].imagePullPolicy":           "{{ .Values.tap.docker.imagePullPolicy }}",
+	"spec.containers[0].resources.limits.cpu":      "{{ .Values.tap.resources.hub.cpu-limit }}",
+	"spec.containers[0].resources.limits.memory":   "{{ .Values.tap.resources.hub.memory-limit }}",
+	"spec.containers[0].resources.requests.cpu":    "{{ .Values.tap.resources.hub.cpu-requests }}",
+	"spec.containers[0].resources.requests.memory": "{{ .Values.tap.resources.hub.memory-requests }}",
+}
+var hubServiceMappings = namespaceMappings
+var frontPodMappings = map[string]interface{}{
+	"metadata.name":                      "{{ .Values.tap.selfnamespace }}",
+	"spec.containers[0].image":           "{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.tag }}",
+	"spec.containers[0].imagePullPolicy": "{{ .Values.tap.docker.imagePullPolicy }}",
+}
+var frontServiceMappings = namespaceMappings
+var workerDaemonSetMappings = map[string]interface{}{
+	"metadata.name":                                              "{{ .Values.tap.selfnamespace }}",
+	"spec.template.spec.containers[0].image":                     "{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}",
+	"spec.template.spec.containers[0].imagePullPolicy":           "{{ .Values.tap.docker.imagePullPolicy }}",
+	"spec.template.spec.containers[0].resources.limits.cpu":      "{{ .Values.tap.resources.worker.cpu-limit }}",
+	"spec.template.spec.containers[0].resources.limits.memory":   "{{ .Values.tap.resources.worker.memory-limit }}",
+	"spec.template.spec.containers[0].resources.requests.cpu":    "{{ .Values.tap.resources.worker.cpu-requests }}",
+	"spec.template.spec.containers[0].resources.requests.memory": "{{ .Values.tap.resources.worker.memory-requests }}",
+}
+
 func init() {
 	rootCmd.AddCommand(helmChartCmd)
 }
@@ -126,15 +182,15 @@ func runHelmChart() {
 	}
 
 	err = dumpHelmChart(map[string]interface{}{
-		"00-namespace.yaml":            namespace,
+		"00-namespace.yaml":            template(namespace, namespaceMappings),
-		"01-service-account.yaml":      serviceAccount,
+		"01-service-account.yaml":      template(serviceAccount, serviceAccountMappings),
-		"02-cluster-role.yaml":         clusterRole,
+		"02-cluster-role.yaml":         template(clusterRole, clusterRoleMappings),
-		"03-cluster-role-binding.yaml": clusterRoleBinding,
+		"03-cluster-role-binding.yaml": template(clusterRoleBinding, clusterRoleBindingMappings),
-		"04-hub-pod.yaml":              hubPod,
+		"04-hub-pod.yaml":              template(hubPod, hubPodMappings),
-		"05-hub-service.yaml":          hubService,
+		"05-hub-service.yaml":          template(hubService, hubServiceMappings),
-		"06-front-pod.yaml":            frontPod,
+		"06-front-pod.yaml":            template(frontPod, frontPodMappings),
-		"07-front-service.yaml":        frontService,
+		"07-front-service.yaml":        template(frontService, frontServiceMappings),
-		"08-worker-daemon-set.yaml":    workerDaemonSet,
+		"08-worker-daemon-set.yaml":    template(workerDaemonSet, workerDaemonSetMappings),
 	})
 	if err != nil {
 		log.Error().Err(err).Send()
@@ -142,6 +198,48 @@ func runHelmChart() {
 	}
 }
 
+func template(object interface{}, mappings map[string]interface{}) (template interface{}) {
+	var err error
+	var data []byte
+	data, err = json.Marshal(object)
+	if err != nil {
+		log.Error().Err(err).Send()
+		return
+	}
+
+	var obj interface{}
+	obj, err = oj.Parse(data)
+	if err != nil {
+		log.Error().Err(err).Send()
+		return
+	}
+
+	for path, value := range mappings {
+		var x jp.Expr
+		x, err = jp.ParseString(path)
+		if err != nil {
+			log.Error().Err(err).Send()
+			return
+		}
+
+		err = x.Set(obj, value)
+		if err != nil {
+			log.Error().Err(err).Send()
+			return
+		}
+	}
+
+	newJson := oj.JSON(obj)
+
+	err = json.Unmarshal([]byte(newJson), &template)
+	if err != nil {
+		log.Error().Err(err).Send()
+		return
+	}
+
+	return
+}
+
 func dumpHelmChart(objects map[string]interface{}) error {
 	folder := filepath.Join(".", "helm-chart")
 	templatesFolder := filepath.Join(folder, "templates")

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/gin-gonic/gin v1.7.7
 	github.com/google/go-github/v37 v37.0.0
 	github.com/gorilla/websocket v1.4.2
+	github.com/ohler55/ojg v1.14.5
 	github.com/otiai10/copy v1.10.0
 	github.com/robertkrimen/otto v0.2.1
 	github.com/rs/zerolog v1.28.0

go.sum

@@ -27,7 +27,6 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW
 cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
 cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
 cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y=
 cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
@@ -114,10 +113,8 @@ github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -505,6 +502,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/ohler55/ojg v1.14.5 h1:xCX2oyh/ZaoesbLH6fwVHStSJpk4o4eJs8ttXutzdg0=
+github.com/ohler55/ojg v1.14.5/go.mod h1:7Ghirupn8NC8hSSDpI0gcjorPxj+vSVIONDWfliHR1k=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -523,7 +522,6 @@ github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zM
 github.com/otiai10/copy v1.10.0 h1:znyI7l134wNg/wDktoVQPxPkgvhDfGCYUasey+h0rDQ=
 github.com/otiai10/copy v1.10.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
 github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
-github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -633,7 +631,6 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -648,7 +645,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
@@ -790,8 +786,6 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -824,7 +818,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -908,17 +901,11 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -930,7 +917,6 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1172,7 +1158,6 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/readline.v1 v1.0.0-20160726135117-62c6fe619375/go.mod h1:lNEQeAhU009zbRxng+XOj5ITVgY24WcbNnQopyfKoYQ=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
 gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78=

helm-chart/templates/00-namespace.yaml

@@ -5,6 +5,6 @@ metadata:
   labels:
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark
+  name: '{{ .Values.tap.selfnamespace }}'
 spec: {}
 status: {}

helm-chart/templates/01-service-account.yaml

@@ -6,5 +6,5 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-service-account
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark

helm-chart/templates/02-cluster-role.yaml

@@ -6,7 +6,7 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-cluster-role
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 rules:
   - apiGroups:

helm-chart/templates/03-cluster-role-binding.yaml

@@ -6,7 +6,7 @@ metadata:
     kubeshark-cli-version: v1
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-service-account
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -15,4 +15,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: kubeshark-service-account
-    namespace: kubeshark
+    namespace: '{{ .Values.tap.selfnamespace }}'

helm-chart/templates/04-hub-pod.yaml

@@ -6,7 +6,7 @@ metadata:
     app: kubeshark-hub
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-hub
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 spec:
   containers:
@@ -14,21 +14,23 @@ spec:
         - ./hub
       env:
         - name: POD_REGEX
-          value: .*
+          value: '{{ .Values.tap.regex }}'
         - name: NAMESPACES
+          value: '{{ .Values.tap.namespaces }}'
         - name: STORAGE_LIMIT
-          value: 200MB
+          value: '{{ .Values.tap.storagelimit }}'
         - name: LICENSE
-      image: docker.io/kubeshark/hub:latest
+          value: '{{ .Values.license }}'
-      imagePullPolicy: Always
+      image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.tag }}'
+      imagePullPolicy: '{{ .Values.tap.docker.imagePullPolicy }}'
       name: kubeshark-hub
       resources:
         limits:
-          cpu: 750m
+          cpu: '{{ .Values.tap.resources.hub.cpu-limit }}'
-          memory: 1Gi
+          memory: '{{ .Values.tap.resources.hub.memory-limit }}'
         requests:
-          cpu: 50m
+          cpu: '{{ .Values.tap.resources.hub.cpu-requests }}'
-          memory: 50Mi
+          memory: '{{ .Values.tap.resources.hub.memory-requests }}'
   dnsPolicy: ClusterFirstWithHostNet
   serviceAccountName: kubeshark-service-account
   terminationGracePeriodSeconds: 0

helm-chart/templates/05-hub-service.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-hub
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 spec:
   ports:

helm-chart/templates/06-front-pod.yaml

@@ -6,7 +6,7 @@ metadata:
     app: kubeshark-front
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-front
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 spec:
   containers:
@@ -17,8 +17,8 @@ spec:
           value: ' '
         - name: REACT_APP_HUB_PORT
           value: "8898"
-      image: docker.io/kubeshark/front:latest
+      image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.tag }}'
-      imagePullPolicy: Always
+      imagePullPolicy: '{{ .Values.tap.docker.imagePullPolicy }}'
       name: kubeshark-front
       readinessProbe:
         failureThreshold: 3

helm-chart/templates/07-front-service.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-front
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 spec:
   ports:

helm-chart/templates/08-worker-daemon-set.yaml

@@ -6,7 +6,7 @@ metadata:
     app: kubeshark-worker-daemon-set
     kubeshark-created-by: kubeshark
     kubeshark-managed-by: kubeshark
-  name: kubeshark-worker-daemon-set
+  name: '{{ .Values.tap.selfnamespace }}'
   namespace: kubeshark
 spec:
   selector:
@@ -35,16 +35,16 @@ spec:
             - -tls
             - -procfs
             - /hostproc
-          image: docker.io/kubeshark/worker:latest
+          image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}'
-          imagePullPolicy: Always
+          imagePullPolicy: '{{ .Values.tap.docker.imagePullPolicy }}'
           name: kubeshark-worker-daemon-set
           resources:
             limits:
-              cpu: 750m
+              cpu: '{{ .Values.tap.resources.worker.cpu-limit }}'
-              memory: 1Gi
+              memory: '{{ .Values.tap.resources.worker.memory-limit }}'
             requests:
-              cpu: 50m
+              cpu: '{{ .Values.tap.resources.worker.cpu-requests }}'
-              memory: 50Mi
+              memory: '{{ .Values.tap.resources.worker.memory-requests }}'
           securityContext:
             capabilities:
               add:

kubernetes/provider.go

@@ -448,7 +448,7 @@ func (provider *Provider) BuildFrontService(namespace string) *core.Service {
 				{
 					Name:       FrontServiceName,
 					TargetPort: intstr.FromInt(80),
-					Port:       int32(config.Config.Tap.Proxy.Front.DstPort),
+					Port:       80,
 				},
 			},
 			Type:     core.ServiceTypeClusterIP,