Add basic Helm chart unittests for kuberay-operator (#3253)

Author: ChenYi015

Diff for: helm-chart/kuberay-operator/templates/deployment.yaml

@@ -2,11 +2,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kuberay-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
-{{ include "kuberay-operator.labels" . | indent 4 }}
-{{- if .Values.labels }}
-{{- toYaml .Values.labels | nindent 4 }}
-{{- end }}
+    {{- include "kuberay-operator.labels" . | nindent 4 }}
+    {{- with .Values.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: 1
   strategy:
@@ -21,12 +22,12 @@ spec:
         app.kubernetes.io/name: {{ include "kuberay-operator.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/component: {{ include "kuberay-operator.component" . }}
-        {{- if .Values.labels }}
-        {{- toYaml .Values.labels | nindent 8 }}
+        {{- with .Values.labels }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
-      {{- if .Values.annotations }}
+      {{- with .Values.annotations }}
       annotations:
-        {{- toYaml .Values.annotations | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
@@ -44,14 +45,20 @@ spec:
           emptyDir: {}
           {{- end }}
       {{- end }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- with .Values.securityContext }}
           securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.image.pullPolicy }}
+          imagePullPolicy: {{ . }}
+          {{- end }}
           {{- if and (.Values.logging.baseDir) (.Values.logging.fileName) }}
           volumeMounts:
             - name: kuberay-logs
@@ -107,8 +114,10 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+          {{- with .Values.env }}
           env:
-          {{- toYaml .Values.env | nindent 12}}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /metrics
@@ -123,17 +132,19 @@ spec:
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-    {{- with .Values.affinity }}
+      {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
+      {{- end }}
+      {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
+      {{- end }}

Diff for: helm-chart/kuberay-operator/templates/role.yaml

@@ -1,10 +1,9 @@
 {{- if and .Values.rbacEnable (not .Values.singleNamespaceInstall) }}
-
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  labels:
-{{ include "kuberay-operator.labels" . | indent 4 }}
   name: {{ include "kuberay-operator.fullname" . }}
+  labels:
+    {{- include "kuberay-operator.labels" . | nindent 4 }}
 {{ include "role.consistentRules" (dict "batchSchedulerEnabled" .Values.batchScheduler.enabled "batchSchedulerName" .Values.batchScheduler.name) }}
 {{- end }}

Diff for: helm-chart/kuberay-operator/templates/rolebinding.yaml

@@ -2,15 +2,15 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  labels:
-{{ include "kuberay-operator.labels" . | indent 4 }}
   name: {{ include "kuberay-operator.fullname" . }}
+  labels:
+    {{- include "kuberay-operator.labels" . | nindent 4 }}
 subjects:
 - kind: ServiceAccount
   name: {{ .Values.serviceAccount.name  }}
   namespace: {{ .Release.Namespace }}
 roleRef:
+  apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: {{ include "kuberay-operator.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
 {{- end }}

Diff for: helm-chart/kuberay-operator/templates/service.yaml

@@ -2,8 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "kuberay-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
-{{ include "kuberay-operator.labels" . | indent 4 }}
+    {{- include "kuberay-operator.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

Diff for: helm-chart/kuberay-operator/templates/serviceaccount.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "kuberay-operator.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
-{{ include "kuberay-operator.labels" . | indent 4 }}
+    {{- include "kuberay-operator.labels" . | nindent 4 }}
 {{- end -}}