fixing naming

Author: wlanboy

javahttpclient-chart/templates/deployment.yaml

@@ -11,17 +11,14 @@ spec:
     metadata:
       labels:
         app: {{ .Values.deploymentname }}
-        # Aktiviert die automatische Istio-Sidecar Injection
         sidecar.istio.io/inject: "true"
     spec:
-      # Hier wird der neue ServiceAccount zugewiesen
-      serviceAccountName: {{ include "mychart.fullname" . }}-sa
+      serviceAccountName: {{ .Values.deploymentname }}-sa
       containers:
         - name: {{ .Values.deploymentname }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            # Hilfreich für den K8sDiagnosticService, falls das File-Reading fehlschlägt
             - name: KUBERNETES_NAMESPACE
               valueFrom:
                 fieldRef:

javahttpclient-chart/templates/rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "java-http-client.fullname" . }}-diagnostic-role
+  name: {{ .Values.deploymentname }}-diagnostic-role
 rules:
   # Standard Ressourcen für den Kontext
   - apiGroups: [""]
@@ -16,12 +16,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "java-http-client.fullname" . }}-diagnostic-binding
+  name: {{ .Values.deploymentname }}-diagnostic-binding
 subjects:
   - kind: ServiceAccount
-    name: {{ include "java-http-client.fullname" . }}-sa
+    name: {{ .Values.deploymentname }}-sa
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ include "java-http-client.fullname" . }}-diagnostic-role
+  name: {{ .Values.deploymentname }}-diagnostic-role
   apiGroup: rbac.authorization.k8s.io

javahttpclient-chart/templates/serviceaccount.yaml

@@ -1,8 +1,6 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "java-http-client.fullname" . }}-sa
+  name: {{ .Values.deploymentname }}-sa
   namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "java-http-client.labels" . | nindent 4 }}
 automountServiceAccountToken: true