chart: rdma tools

Signed-off-by: [email protected] <[email protected]>
spidernet-io · Aug 2, 2024 · 84498b0 · 84498b0
1 parent 5768102
commit 84498b0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/rdma-tools/chart/templates/_helpers.tpl b/rdma-tools/chart/templates/_helpers.tpl
@@ -31,3 +31,11 @@ return the image
 {{- end -}}
 {{- end -}}
 
+
+{{/*
+return the image
+*/}}
+{{- define "project.name" -}}
+{{- printf "%s" .Values.name -}}
+{{- printf "-%s" .Release.Name -}}
+{{- end -}}
diff --git a/rdma-tools/chart/templates/daemonset.yaml b/rdma-tools/chart/templates/daemonset.yaml
@@ -1,20 +1,20 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name:  {{ .Values.name | trunc 63 | trimSuffix "-" }}
+  name:  {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
 spec:
   selector:
     matchLabels:
-      app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+      app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   updateStrategy:
     type: OnDelete
   template:
     metadata:
       labels:
-        app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+        app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
       {{- if .Values.extraAnnotations }}
       annotations:
         {{- include "tplvalues.render" ( dict "value" .Values.extraAnnotations "context" $ ) | nindent 8 }}
@@ -33,7 +33,7 @@ spec:
       hostNetwork: false
       dnsPolicy: ClusterFirst
       {{- end }}
-      serviceAccountName: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+      serviceAccountName: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
       restartPolicy: Always
       {{- with .Values.tolerations }}
       tolerations:
@@ -85,7 +85,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
             - name: ENV_SERVICE_NAME
-              value: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+              value: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
             - name: ENV_POD_NAMESPACE
               valueFrom:
                 fieldRef:

diff --git a/rdma-tools/chart/templates/role.yaml b/rdma-tools/chart/templates/role.yaml
@@ -1,10 +1,10 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+  name: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
 rules:
   - apiGroups:
       - ""

diff --git a/rdma-tools/chart/templates/role_binding.yaml b/rdma-tools/chart/templates/role_binding.yaml
@@ -1,15 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+  name: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+  name: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    name: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
     namespace: {{ .Release.Namespace }}
diff --git a/rdma-tools/chart/templates/service.yaml b/rdma-tools/chart/templates/service.yaml
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+  name: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
 spec:
   type: {{ .Values.service.type }}
   selector:
-    app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   ports:
     - name: ssh
       port: 22

diff --git a/rdma-tools/chart/templates/serviceaccount.yaml b/rdma-tools/chart/templates/serviceaccount.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+  name: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Values.name | trunc 63 | trimSuffix "-" }}
+    app: {{ include "project.name" . | trunc 63 | trimSuffix "-" | quote }}