[helm]: Include default helpers, rename using fullname

Signed-off-by: cabrinha <yuppie@hey.com>

Author: cabrinha

dist/chart/templates/_helpers.tpl

@@ -1,38 +1,4 @@
-{{- define "chart.name" -}}
-{{- if .Chart }}
-  {{- if .Chart.Name }}
-    {{- .Chart.Name | trunc 63 | trimSuffix "-" }}
-  {{- else if .Values.nameOverride }}
-    {{ .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-  {{- else }}
-    aibrix
-  {{- end }}
-{{- else }}
-  aibrix
-{{- end }}
-{{- end }}
-
-
-{{- define "chart.labels" -}}
-{{- if .Chart.AppVersion -}}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-{{- if .Chart.Version }}
-helm.sh/chart: {{ .Chart.Version | quote }}
-{{- end }}
-app.kubernetes.io/name: {{ include "chart.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-
-{{- define "chart.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "chart.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-
-{{- define "chart.hasMutatingWebhooks" -}}
+{{- define "aibrix.hasMutatingWebhooks" -}}
 {{- $d := dict "found" false -}}
 {{- range . -}}
   {{- if eq .type "mutating" -}}
@@ -42,7 +8,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- $d.found -}}
 {{- end -}}
 
-{{- define "chart.hasValidatingWebhooks" -}}
+{{- define "aibrix.hasValidatingWebhooks" -}}
 {{- $d := dict "found" false -}}
 {{- range . -}}
   {{- if eq .type "validating" -}}
@@ -55,10 +21,73 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{/*
 Renders imagePullSecrets block
 */}}
-{{- define "chart.imagePullSecrets" -}}
+{{- define "aibrix.imagePullSecrets" -}}
 {{- $secrets := .componentSecrets | default .globalSecrets -}}
 {{- if $secrets -}}
 imagePullSecrets:
 {{- toYaml $secrets | nindent 2 }}
 {{- end -}}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "aibrix.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "aibrix.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "aibrix.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "aibrix.labels" -}}
+helm.sh/chart: {{ include "aibrix.chart" . }}
+{{ include "aibrix.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "aibrix.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "aibrix.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "aibrix.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "aibrix.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

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

@@ -3,22 +3,21 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: aibrix-controller-manager
-    {{- include "chart.labels" . | nindent 4 }}
-  name: aibrix-controller-manager
-  namespace: {{ .Release.Namespace }}
+    {{- include "aibrix.labels" . | nindent 4 }}
+  name: {{ include "aibrix.fullname" . }}-controller-manager
 spec:
   replicas: {{ .Values.controllerManager.replicas }}
   selector:
     matchLabels:
-      {{- include "chart.selectorLabels" . | nindent 6 }}
+      {{- include "aibrix.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: aibrix-controller-manager
   template:
     metadata:
       labels:
-        {{- include "chart.labels" . | nindent 8 }}
+        {{- include "aibrix.labels" . | nindent 8 }}
         app.kubernetes.io/component: aibrix-controller-manager
     spec:
-      {{- include "chart.imagePullSecrets" (dict "componentSecrets" .Values.controllerManager.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 6 }}
+      {{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.controllerManager.imagePullSecrets "globalSecrets" .Values.global.imagePullSecrets) | nindent 6 }}
       containers:
       - args:
         - --leader-elect
@@ -53,13 +52,13 @@ spec:
           readOnly: true
       securityContext:
         runAsNonRoot: true
-      serviceAccountName: aibrix-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

@@ -2,17 +2,15 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
-  name: aibrix-controller-manager
-  namespace: {{ .Release.Namespace }}
+    {{- include "aibrix.labels" . | nindent 4 }}
+  name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: aibrix-controller-manager-clusterrole
+  name: {{ include "aibrix.fullname" . }}-controller-manager
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - ""
@@ -301,33 +299,29 @@ rules:
   - list
   - update
   - watch
-
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
-  name: aibrix-controller-manager-clusterrolebinding
+    {{- include "aibrix.labels" . | nindent 4 }}
+  name: {{ include "aibrix.fullname" . }}-controller-manager
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: aibrix-controller-manager-clusterrole
+  name: {{ include "aibrix.fullname" . }}-controller-manager
 subjects:
 - kind: ServiceAccount
-  name: aibrix-controller-manager
+  name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
   namespace: {{ .Release.Namespace }}
-
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: aibrix-controller-manager-leader-election-role
+  name: {{ include "aibrix.fullname" . }}-controller-manager-leader-election
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - ""
@@ -360,20 +354,18 @@ rules:
   verbs:
   - create
   - patch
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: aibrix-controller-manager-leader-election-rolebinding
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-controller-manager-leader-election
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: aibrix-controller-manager-leader-election-role
+  name: {{ include "aibrix.fullname" . }}-controller-manager-leader-election
 subjects:
 - kind: ServiceAccount
-  name: aibrix-controller-manager
+  name: {{ include "aibrix.serviceAccountName" . }}-controller-manager
   namespace: {{ .Release.Namespace }}

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

@@ -1,14 +1,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: aibrix-controller-manager-metrics-service
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-controller-manager-metrics
   annotations:
     prometheus.io/path: /metrics
     prometheus.io/port: "8080"
     prometheus.io/scrape: "true"
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-controller-manager
 spec:
   ports:
@@ -17,5 +16,5 @@ spec:
     protocol: TCP
     targetPort: 8080
   selector:
-    {{- include "chart.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: aibrix-controller-manager
+    {{- include "aibrix.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: aibrix-controller-manager

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

@@ -2,29 +2,27 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
 metadata:
-  name: aibrix-eg
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-eg
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-gateway
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
   parametersRef:
     group: gateway.envoyproxy.io
     kind: EnvoyProxy
-    name: aibrix-custom-proxy-config
+    name: {{ include "aibrix.fullname" . }}-custom-proxy-config
     namespace: {{ .Release.Namespace }}
 ---
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: aibrix-eg
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-eg
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-gateway
 spec:
-  gatewayClassName: aibrix-eg
+  gatewayClassName: {{ include "aibrix.fullname" . }}-eg
   listeners:
     - name: http
       protocol: HTTP
@@ -33,8 +31,7 @@ spec:
 apiVersion: gateway.envoyproxy.io/v1alpha1
 kind: EnvoyProxy
 metadata:
-  name: aibrix-custom-proxy-config
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-custom-proxy-config
 spec:
   provider:
     type: Kubernetes
@@ -65,7 +62,7 @@ spec:
                     app.kubernetes.io/name: envoy
                     app.kubernetes.io/component: proxy
                 spec:
-                  {{- include "chart.imagePullSecrets" (dict "componentSecrets" .Values.gateway.envoyProxy.imagePullSecrets "globalSecrets") | nindent 18 }}
+                  {{- include "aibrix.imagePullSecrets" (dict "componentSecrets" .Values.gateway.envoyProxy.imagePullSecrets "globalSecrets") | nindent 18 }}
                   containers:
                     - name: envoy
                       image: {{ .Values.gateway.envoyProxy.container.envoy.image }}
@@ -77,36 +74,34 @@ spec:
 apiVersion: gateway.envoyproxy.io/v1alpha1
 kind: ClientTrafficPolicy
 metadata:
-  name: aibrix-client-connection-buffersize
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-client-connection-buffersize
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-gateway
 spec:
   targetRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: aibrix-eg
+      name: {{ include "aibrix.fullname" . }}-eg
   connection:
     bufferLimit: {{ .Values.gateway.clientTrafficPolicy.connection.bufferLimit }}
 ---
 apiVersion: gateway.envoyproxy.io/v1alpha1
 kind: EnvoyPatchPolicy
 metadata:
-  name: aibrix-epp
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "aibrix.fullname" . }}-epp
   labels:
-    {{- include "chart.labels" . | nindent 4 }}
+    {{- include "aibrix.labels" . | nindent 4 }}
     app.kubernetes.io/component: aibrix-gateway
 spec:
   type: "JSONPatch"
   targetRef:
     group: gateway.networking.k8s.io
     kind: Gateway
-    name: aibrix-eg
+    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"
@@ -140,4 +135,4 @@ spec:
           connect_timeout: {{ .Values.gateway.envoyPatchPolicy.route.connectTimeout }}
           lb_policy: CLUSTER_PROVIDED
           dns_lookup_family: V4_ONLY
-{{- end }}
+{{- end }}