Allow multiple installations of the Tetragon Helm chart

Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io>
cilium · Aug 28, 2023 · 0f94920 · 0f94920
1 parent 0de4662
commit 0f94920
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/install/kubernetes/templates/clusterrole.yaml b/install/kubernetes/templates/clusterrole.yaml
@@ -2,7 +2,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{.Chart.Name}}
+  name: {{.Release.Name}}
   labels:
   {{- include "tetragon.labels" . | nindent 4 }}
 rules:

diff --git a/install/kubernetes/templates/clusterrolebinding.yml b/install/kubernetes/templates/clusterrolebinding.yml
@@ -2,15 +2,15 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ .Release.Name }}
   labels:
   {{- include "tetragon.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Chart.Name }}
+  name: {{ .Release.Name }}
 subjects:
   - kind: ServiceAccount
     namespace: {{ .Release.Namespace }}
-    name: {{ .Chart.Name }}
+    name: {{ .Release.Name }}
 {{- end }}
diff --git a/install/kubernetes/templates/daemonset.yaml b/install/kubernetes/templates/daemonset.yaml
@@ -11,7 +11,7 @@ metadata:
   {{- else }}
     {{- include "tetragon.labels" . | nindent 4 }}
   {{- end }}
-  name: {{ .Chart.Name }}
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 spec:
   selector:
@@ -39,7 +39,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Chart.Name }}
+      serviceAccountName: {{ .Release.Name }}
       {{- with .Values.podSecurityContext }}
       securityContext:
         {{- toYaml . | nindent 6 }}
@@ -82,7 +82,7 @@ spec:
 {{- if .Values.tetragon.enabled }}
       - name: tetragon-config
         configMap:
-          name: {{ .Chart.Name }}-config
+          name: {{ .Release.Name }}-config
       - name: bpf-maps
         hostPath:
           path: /sys/fs/bpf
@@ -99,7 +99,7 @@ spec:
 {{- if .Values.tetragonOperator.enabled }}
       - name: tetragon-operator-config
         configMap:
-          name: {{ .Chart.Name }}-operator-config
+          name: {{ .Release.Name }}-operator-config
 {{- end }}
       {{- with .Values.extraVolumes }}
         {{- toYaml . | nindent 6 }}

diff --git a/install/kubernetes/templates/operator_clusterrole.yaml b/install/kubernetes/templates/operator_clusterrole.yaml
@@ -2,7 +2,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{.Chart.Name}}-operator
+  name: {{.Release.Name}}-operator
   labels:
   {{- include "tetragon-operator.labels" . | nindent 4 }}
 rules:

diff --git a/install/kubernetes/templates/operator_clusterrolebinding.yaml b/install/kubernetes/templates/operator_clusterrolebinding.yaml
@@ -2,15 +2,15 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Chart.Name }}-operator-rolebinding
+  name: {{ .Release.Name }}-operator-rolebinding
   labels:
   {{- include "tetragon-operator.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Chart.Name }}-operator-role
+  name: {{ .Release.Name }}-operator-role
 subjects:
   - kind: ServiceAccount
     namespace: {{ .Release.Namespace }}
-    name: {{ .Chart.Name }}-operator-service-account
+    name: {{ .Release.Name }}-operator-service-account
 {{- end }}
diff --git a/install/kubernetes/templates/operator_configmap.yaml b/install/kubernetes/templates/operator_configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name }}-operator-config
+  name: {{ .Release.Name }}-operator-config
   namespace: {{ .Release.Namespace }}
   labels:
   {{- include "tetragon-operator.labels" . | nindent 4 }}

diff --git a/install/kubernetes/templates/operator_deployment.yaml b/install/kubernetes/templates/operator_deployment.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:
   labels: 
     {{- include "tetragon-operator.labels" . | nindent 4 }}
-  name: {{ .Chart.Name }}-operator
+  name: {{ .Release.Name }}-operator
   namespace: {{ .Release.Namespace }}
 spec:
   selector:
@@ -17,7 +17,7 @@ spec:
         {{- include "tetragon-operator.labels" . | nindent 8 }}
     spec:
       containers:
-      - name: {{ .Chart.Name }}-operator
+      - name: {{ .Release.Name }}-operator
         command:
           - /usr/bin/tetragon-operator
         args:
@@ -47,6 +47,6 @@ spec:
           requests:
             cpu: 10m
             memory: 64Mi
-      serviceAccountName: {{ .Chart.Name }}-operator-service-account
+      serviceAccountName: {{ .Release.Name }}-operator-service-account
       terminationGracePeriodSeconds: 10
 {{- end }}
diff --git a/install/kubernetes/templates/operator_serviceaccount.yaml b/install/kubernetes/templates/operator_serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Chart.Name }}-operator-service-account
+  name: {{ .Release.Name }}-operator-service-account
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tetragon-operator.labels" . | nindent 4 }}

diff --git a/install/kubernetes/templates/service.yaml b/install/kubernetes/templates/service.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- else }}
     {{- include "tetragon.labels" . | nindent 4 }}
     {{- end }}
-  name: {{ .Chart.Name }}
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 spec:
   ports:

diff --git a/install/kubernetes/templates/serviceaccount.yaml b/install/kubernetes/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tetragon.labels" . | nindent 4 }}

diff --git a/install/kubernetes/templates/tetragon_configmap.yaml b/install/kubernetes/templates/tetragon_configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name }}-config
+  name: {{ .Release.Name }}-config
   namespace: {{ .Release.Namespace }}
   labels:
   {{- include "tetragon.labels" . | nindent 4 }}