Allow more customization of kes section in tenant (#2452)

* Allow more customization of kes section in tenant

* Add more examples in the values

* keep backward compatibility

* Add take affinity values from the right structure

* correct indentation of sideCars

* add comment

Author: killerwhile

helm/tenant/templates/tenant.yaml

@@ -184,22 +184,24 @@ spec:
     {{- end }}
     ## Key name to be created on the KMS, default is "my-minio-key"
     keyName: {{ .kes.keyName | quote }}
-    {{- with (dig "resources" (dict) .) }}
-    resources: {{- toYaml . | nindent 4 }}
+    {{- with (dig "kes" "resources" (dict) .) | default (dig "resources" (dict) .)}}
+    resources: {{- toYaml . | nindent 6 }}
     {{- end }}
-    {{- with (dig "nodeSelector" (dict) .) }}
-    nodeSelector: {{- toYaml . | nindent 4 }}
+    {{- with (dig "kes" "nodeSelector" (dict) .) | default (dig "nodeSelector" (dict) .) }}
+    nodeSelector: {{- toYaml . | nindent 6 }}
     {{- end }}
     affinity:
-      nodeAffinity: {}
-      podAffinity: {}
-      podAntiAffinity: {}
-    tolerations: []
-    {{- with (dig "annotations" (dict) .) }}
-    annotations: {{- toYaml . | nindent 4 }}
+      nodeAffinity: {{- (dig "kes" "affinity" "nodeAffinity" (dict) .) | toYaml | nindent 8 }}
+      podAffinity: {{- (dig "kes" "affinity" "podAffinity" (dict) .) | toYaml | nindent 8 }}
+      podAntiAffinity: {{- (dig "kes" "affinity" "podAntiAffinity" (dict) .) | toYaml | nindent 8 }}
+    {{- with (dig "kes" "tolerations" (list) .) }}
+    tolerations: {{- toYaml . | nindent 4 }}
     {{- end }}
-    {{- with (dig "labels" (dict) .) }}
-    labels: {{- toYaml . | nindent 4 }}
+    {{- with (dig "kes" "annotations" (dict) .) | default (dig "annotations" (dict) .) }}
+    annotations: {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with (dig "kes" "labels" (dict) .) | default (dig "labels" (dict) .) }}
+    labels: {{- toYaml . | nindent 6 }}
     {{- end }}
     serviceAccountName: {{ .kes.serviceAccountName | quote }}
     {{- if hasKey .kes "securityContext" }}
@@ -215,4 +217,7 @@ spec:
       {{- end }}
       {{- end }}
   {{- end }}
+  {{- with (dig "sideCars" (dict) .) }}
+  sideCars: {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}

helm/tenant/values.yaml

@@ -481,6 +481,11 @@ tenant:
   #    seccompProfile:
   #      type: RuntimeDefault
 
+  ###
+  # Customize sideCars, as defined in https://min.io/docs/minio/kubernetes/upstream/reference/operator-crd.html#sidecars
+  #sideCars:
+  #  resources: { }
+
 ###
 # Configures `Ingress <https://kubernetes.io/docs/concepts/services-networking/ingress/>`__ for the Tenant S3 API and Console.
 #