naming-fixes

Author: wormhole-wayne

dist/chart/templates/controller-manager/deployment.yaml

@@ -52,13 +52,13 @@ spec:
           readOnly: true
       securityContext:
         runAsNonRoot: true
-      serviceAccountName: {{ include "aibrix.fullname" . }}-controller-manager
+      serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-controller-manager
       terminationGracePeriodSeconds: 10
       volumes:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: aibrix-webhook-server-cert
+          secretName: {{ include "aibrix.fullname" . }}-webhook-server-cert
       {{- with .Values.controllerManager.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

dist/chart/templates/controller-manager/rbac.yaml

@@ -3,9 +3,8 @@ kind: ServiceAccount
 metadata:
   labels:
     {{- include "aibrix.labels" . | nindent 4 }}
-  name: {{ include "aibrix.fullname" . }}-controller-manager
+  name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -300,8 +299,6 @@ rules:
   - list
   - update
   - watch
-
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -315,10 +312,8 @@ roleRef:
   name: {{ include "aibrix.fullname" . }}-controller-manager
 subjects:
 - kind: ServiceAccount
-  name: {{ include "aibrix.fullname" . }}-controller-manager
+  name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
   namespace: {{ .Release.Namespace }}
-
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -359,7 +354,6 @@ rules:
   verbs:
   - create
   - patch
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -373,5 +367,5 @@ roleRef:
   name: {{ include "aibrix.fullname" . }}-controller-manager-leader-election
 subjects:
 - kind: ServiceAccount
-  name: {{ include "aibrix.fullname" . }}-controller-manager
+  name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
   namespace: {{ .Release.Namespace }}

dist/chart/templates/gateway-instance/gateway.yaml

@@ -101,7 +101,7 @@ spec:
     name: {{ include "aibrix.fullname" . }}-eg
   jsonPatches:
     - type: type.googleapis.com/envoy.config.route.v3.RouteConfiguration
-      name: "{{ .Release.Namespace }}/aibrix-eg/http"
+      name: {{ .Release.Namespace }}/{{ include "aibrix.fullname" . }}-eg/http
       operation:
         op: add
         path: "/virtual_hosts/0/routes/0"

dist/chart/templates/gateway-plugin/deployment.yaml

@@ -107,5 +107,5 @@ spec:
             {{- toYaml .Values.gatewayPlugin.container.probes.liveness | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.gatewayPlugin.container.probes.readiness | nindent 12 }}
-      serviceAccountName: {{ include "aibrix.fullname" . }}-gateway-plugins
+      serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-gateway-plugins
 {{- end }}

dist/chart/templates/gateway-plugin/rbac.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-gateway-plugin
-  name: {{ include "aibrix.fullname" . }}-gateway-plugins
+  name: {{ include "aibrix.serviceAccountName" . }}-gateway-plugins
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
@@ -63,6 +63,6 @@ roleRef:
   name: {{ include "aibrix.fullname" . }}-gateway-plugins
 subjects:
   - kind: ServiceAccount
-    name: {{ include "aibrix.fullname" . }}-gateway-plugins
+    name: {{ include "aibrix.serviceAccountName" . }}-gateway-plugins
     namespace: {{ .Release.Namespace }}
 {{- end }}

dist/chart/templates/gpu-optimizer/deployment.yaml

@@ -17,7 +17,7 @@ spec:
         {{- include "aibrix.labels" . | nindent 8 }}
         app.kubernetes.io/component: aibrix-gpu-optimizer
     spec:
-      serviceAccountName: {{ include "aibrix.fullname" . }}-gpu-optimizer
+      serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-gpu-optimizer
       automountServiceAccountToken: true
       {{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.gpuOptimizer.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 6 }}
       containers:

dist/chart/templates/gpu-optimizer/rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "aibrix.fullname" . }}-gpu-optimizer
+  name: {{ include "aibrix.serviceAccountName" . }}-gpu-optimizer
   labels:
     {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-gpu-optimizer
@@ -31,5 +31,5 @@ subjects:
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ include "aibrix.fullname" . }}-gpu-optimizer
+  name: {{ include "aibrix.serviceAccountName" . }}-gpu-optimizer
   apiGroup: rbac.authorization.k8s.io

dist/chart/templates/metadata-service/deployment.yaml

@@ -18,7 +18,7 @@ spec:
         app.kubernetes.io/component: aibrix-metadata-service
     spec:
       {{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.metadata.service.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 6 }}
-      serviceAccountName: {{ include "aibrix.fullname" . }}-metadata-service
+      serviceAccountName: {{ include "aibrix.serviceAccountName" . }}-metadata-service
       initContainers:
         - name: init-redis
           image: {{ .Values.metadata.service.initContainer.image.repository }}:{{ .Values.metadata.service.initContainer.image.tag }}
@@ -27,7 +27,7 @@ spec:
             - name: REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: aibrix-redis
+                  name: {{ include "aibrix.fullname" . }}-redis
                   key: redis-password
           command: ['sh', '-c', 'until printf ''AUTH %s\nping\n'' "$REDIS_PASSWORD" | nc {{ .Values.metadata.service.redis.host }} {{ .Values.metadata.service.redis.port }} -w 1 | grep -c PONG; do echo waiting for redis; sleep 2; done']
           {{- else }}

dist/chart/templates/metadata-service/rbac.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-metadata-service
-  name: {{ include "aibrix.fullname" . }}-metadata-service
+  name: {{ include "aibrix.serviceAccountName" . }}-metadata-service
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
@@ -52,5 +52,5 @@ roleRef:
   name: {{ include "aibrix.fullname" . }}-metadata-service-reader
 subjects:
   - kind: ServiceAccount
-    name: {{ include "aibrix.fullname" . }}-metadata-service
+    name: {{ include "aibrix.serviceAccountName" . }}-metadata-service
     namespace: {{ .Release.Namespace }}

dist/chart/templates/prometheus/monitor.yaml

@@ -15,7 +15,7 @@ spec:
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
         {{- if .Values.certmanager.enable }}
-        serverName: {{ include "aibrix.fullname" . }}-controller-manager-metrics-service.{{ .Release.Namespace }}.svc
+        serverName: {{ include "aibrix.fullname" . }}-controller-manager-metrics.{{ .Release.Namespace }}.svc
         # Apply secure TLS configuration with cert-manager
         insecureSkipVerify: false
         ca: