helm chart improvements

Author: nikolaitsarenkov

helm/temporal-worker-controller/templates/manager.yaml

@@ -20,7 +20,7 @@ spec:
   selector:
     matchLabels:
       {{- include "temporal-worker-controller.selectorLabels" . | nindent 6 }}
-  replicas: 1
+  replicas: {{ .Values.replicas }}
   template:
     metadata:
       annotations:
@@ -34,10 +34,9 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
-      {{- if .Values.affinity.enabled }}
+      {{- with .Values.affinity }}
       affinity:
-        {{- toYaml .Values.affinity.podAntiAffinity | nindent 8 }}
-        {{- toYaml .Values.affinity.nodeAffinity | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       securityContext:
         runAsNonRoot: true
@@ -124,4 +123,12 @@ spec:
             secretName: webhook-server-cert
       {{- end }}
       serviceAccountName: {{ .Values.serviceAccount.name | default (printf "%s-service-account" .Release.Name) }}
-      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} 
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

helm/temporal-worker-controller/values.schema.json

@@ -112,100 +112,9 @@
       }
     },
     "affinity": {
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "description": "Whether to enable affinity rules"
-        },
-        "podAntiAffinity": {
-          "type": "object",
-          "properties": {
-            "preferredDuringSchedulingIgnoredDuringExecution": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "weight": {
-                    "type": "integer"
-                  },
-                  "podAffinityTerm": {
-                    "type": "object",
-                    "properties": {
-                      "labelSelector": {
-                        "type": "object",
-                        "properties": {
-                          "matchExpressions": {
-                            "type": "array",
-                            "items": {
-                              "type": "object",
-                              "properties": {
-                                "key": {
-                                  "type": "string"
-                                },
-                                "operator": {
-                                  "type": "string"
-                                },
-                                "values": {
-                                  "type": "array",
-                                  "items": {
-                                    "type": "string"
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "topologyKey": {
-                        "type": "string"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "nodeAffinity": {
-          "type": "object",
-          "properties": {
-            "requiredDuringSchedulingIgnoredDuringExecution": {
-              "type": "object",
-              "properties": {
-                "nodeSelectorTerms": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "matchExpressions": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "key": {
-                              "type": "string"
-                            },
-                            "operator": {
-                              "type": "string"
-                            },
-                            "values": {
-                              "type": "array",
-                              "items": {
-                                "type": "string"
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
+      "default": {},
+      "description": "A Kubernetes Affinity, if required. For more information, see [Affinity v1 core](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#affinity-v1-core).\n\nFor example:\naffinity:\n  nodeAffinity:\n   requiredDuringSchedulingIgnoredDuringExecution:\n     nodeSelectorTerms:\n     - matchExpressions:\n       - key: foo.bar.com/role\n         operator: In\n         values:\n         - master",
+      "type": "object"
     },
     "authProxy": {
       "type": "object",
@@ -289,6 +198,22 @@
           "description": "Whether to create the namespace"
         }
       }
+    },
+    "nodeSelector": {
+      "default": {},
+      "description": "The nodeSelector on Pods tells Kubernetes to schedule Pods on the nodes with matching labels. For more information, see [Assigning Pods to Nodes](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/).\n\nThis default ensures that Pods are only scheduled to Linux nodes. It prevents Pods being scheduled to Windows nodes in a mixed OS cluster.",
+      "type": "object"
+    },
+    "tolerations": {
+      "default": [],
+      "description": "A list of Kubernetes Tolerations, if required. For more information, see [Toleration v1 core](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core).\n\nFor example:\ntolerations:\n- key: foo.bar.com/role\n  operator: Equal\n  value: master\n  effect: NoSchedule",
+      "items": {},
+      "type": "array"
+    },
+    "replicas": {
+      "default": 1,
+      "description": "Number of replicas of manager to run.\n\nThe default is 1, but in production set this to 2 or 3 to provide high availability.",
+      "type": "number"
     }
   }
 } 

helm/temporal-worker-controller/values.yaml

@@ -53,34 +53,33 @@ securityContext:
 # Configure the nodeAffinity expression according to the platforms which are 
 # supported by your solution. It is considered best practice to support multiple
 # architectures. You can build your manager image using the makefile target docker-buildx.
-affinity:
-  enabled: false
-  podAntiAffinity:
-    preferredDuringSchedulingIgnoredDuringExecution:
-    - weight: 100
-      podAffinityTerm:
-        labelSelector:
-          matchExpressions:
-          - key: control-plane
-            operator: In
-            values:
-            - controller-manager
-        topologyKey: kubernetes.io/hostname
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-        - matchExpressions:
-          - key: kubernetes.io/arch
-            operator: In
-            values:
-              - amd64
-              - arm64
-              - ppc64le
-              - s390x
-          - key: kubernetes.io/os
-            operator: In
-            values:
-              - linux
+affinity: {}
+  # podAntiAffinity:
+  #   preferredDuringSchedulingIgnoredDuringExecution:
+  #   - weight: 100
+  #     podAffinityTerm:
+  #       labelSelector:
+  #         matchExpressions:
+  #         - key: control-plane
+  #           operator: In
+  #           values:
+  #           - controller-manager
+  #       topologyKey: kubernetes.io/hostname
+  # nodeAffinity:
+  #   requiredDuringSchedulingIgnoredDuringExecution:
+  #     nodeSelectorTerms:
+  #       - matchExpressions:
+  #         - key: kubernetes.io/arch
+  #           operator: In
+  #           values:
+  #             - amd64
+  #             - arm64
+  #             - ppc64le
+  #             - s390x
+  #         - key: kubernetes.io/os
+  #           operator: In
+  #           values:
+  #             - linux
 
 # Opt out of these resources if you want to disable the
 # auth proxy (https://github.com/brancz/kube-rbac-proxy)
@@ -113,3 +112,9 @@ certmanager:
 # Not yet supported
 prometheus:
   enabled: false
+
+nodeSelector: {}
+
+tolerations: []
+
+replicas: 1