Merge pull request #2495 from vardhaman22/rancher-tracing-chart-fix

[v 2.7] rancher-tracing chart fix

charts/rancher-istio/102.0.0+up1.15.3/charts/tracing/templates/deployment.yaml

@@ -72,8 +72,8 @@ spec:
       securityContext:
         runAsNonRoot: true
         runAsUser: 1000
-      serviceAccountName: {{ include "tracing.fullname" . }}
       {{- end }}
+      serviceAccountName: {{ include "tracing.fullname" . }}
       nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
 {{- if .Values.nodeSelector }}
 {{ toYaml .Values.nodeSelector | indent 8 }}

charts/rancher-istio/102.0.0+up1.15.3/charts/tracing/templates/psp.yaml

@@ -1,14 +1,4 @@
 {{- if .Values.global.cattle.psp.enabled }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "tracing.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Values.provider }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

charts/rancher-istio/102.0.0+up1.15.3/charts/tracing/templates/serviceaccount.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "tracing.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Values.provider }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}

index.yaml

@@ -7084,7 +7084,7 @@ entries:
       catalog.cattle.io/upstream-version: 1.15.3
     apiVersion: v1
     appVersion: 1.15.3
-    created: "2023-02-06T13:26:07.8225-05:00"
+    created: "2023-03-21T16:20:17.910255219+05:30"
     dependencies:
     - condition: kiali.enabled
       name: kiali
@@ -7094,7 +7094,7 @@ entries:
       repository: file://./charts/tracing
     description: A basic Istio setup that installs with the istioctl. Refer to https://istio.io/latest/
       for details.
-    digest: a563bcc7e2ab81ec229d34da279cfa6e5d2c7cb30b093bb93efe3bae1902d290
+    digest: 16f70066e5a7cd995bc56d93f2c87576eae87a2ff6305095b51f299625faa008
     icon: https://charts.rancher.io/assets/logos/istio.svg
     keywords:
     - networking

packages/rancher-istio/1.15/rancher-tracing/charts/templates/deployment.yaml

@@ -72,8 +72,8 @@ spec:
       securityContext:
         runAsNonRoot: true
         runAsUser: 1000
-      serviceAccountName: {{ include "tracing.fullname" . }}
       {{- end }}
+      serviceAccountName: {{ include "tracing.fullname" . }}
       nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
 {{- if .Values.nodeSelector }}
 {{ toYaml .Values.nodeSelector | indent 8 }}

packages/rancher-istio/1.15/rancher-tracing/charts/templates/psp.yaml

@@ -1,14 +1,4 @@
 {{- if .Values.global.cattle.psp.enabled }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "tracing.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Values.provider }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

packages/rancher-istio/1.15/rancher-tracing/charts/templates/serviceaccount.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "tracing.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Values.provider }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}