Merge pull request #9 from /issues/5

feat: scheduler constraints for tcp pods

Author: bsctl

charts/capi-kamaji-proxmox/README.md

@@ -25,6 +25,13 @@ A Helm chart for deploying a Kamaji Tenant Cluster on Proxmox VE using Cluster A
 | cluster.controlPlane.addons.konnectivity | object | `{}` | KamajiControlPlane konnectivity configuration |
 | cluster.controlPlane.addons.kubeProxy | object | `{}` | KamajiControlPlane kube-proxy configuration |
 | cluster.controlPlane.dataStoreName | string | `"default"` | KamajiControlPlane dataStoreName |
+| cluster.controlPlane.deployment | object | `{"additionalMetadata":{"annotations":{},"labels":{}},"affinity":{},"nodeSelector":{"kubernetes.io/os":"linux"},"podAdditionalMetadata":{"annotations":{},"labels":{}},"tolerations":[],"topologySpreadConstraints":[]}` | Configure how KamajiControlPlane deployment should be done |
+| cluster.controlPlane.deployment.additionalMetadata | object | `{"annotations":{},"labels":{}}` | Additional metadata as labels and annotations |
+| cluster.controlPlane.deployment.affinity | object | `{}` | Affinity scheduling rules |
+| cluster.controlPlane.deployment.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector for scheduling |
+| cluster.controlPlane.deployment.podAdditionalMetadata | object | `{"annotations":{},"labels":{}}` | Pods Additional metadata as labels and annotations |
+| cluster.controlPlane.deployment.tolerations | list | `[]` | Tolerations for scheduling |
+| cluster.controlPlane.deployment.topologySpreadConstraints | list | `[]` | TopologySpreadConstraints for scheduling |
 | cluster.controlPlane.kubelet.cgroupfs | string | `"systemd"` | kubelet cgroupfs configuration |
 | cluster.controlPlane.kubelet.preferredAddressTypes | list | `["InternalIP","ExternalIP","Hostname"]` | kubelet preferredAddressTypes order |
 | cluster.controlPlane.labels | object | `{"cni":"calico"}` | Labels to add to the control plane |

charts/capi-kamaji-proxmox/templates/kamaji-control-plane.yaml

@@ -14,6 +14,41 @@ spec:
     coreDNS: {}
     kubeProxy: {}
     konnectivity: {}
+  deployment:
+    additionalMetadata:
+      labels:
+        {{- with .Values.cluster.controlPlane.deployment.additionalMetadata.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.cluster.controlPlane.deployment.additionalMetadata.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    podAdditionalMetadata:
+      labels:
+        {{- with .Values.cluster.controlPlane.deployment.podAdditionalMetadata.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.cluster.controlPlane.deployment.podAdditionalMetadata.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    affinity:
+      {{- with .Values.cluster.controlPlane.deployment.affinity }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+    tolerations:
+      {{- with .Values.cluster.controlPlane.deployment.tolerations }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+    nodeSelector:
+      {{- with .Values.cluster.controlPlane.deployment.nodeSelector }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+    topologySpreadConstraints:
+      {{- with .Values.cluster.controlPlane.deployment.topologySpreadConstraints }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
   kubelet:
     cgroupfs: {{ .Values.cluster.controlPlane.kubelet.cgroupfs | quote }}
     preferredAddressTypes:

charts/capi-kamaji-proxmox/values.yaml

@@ -35,6 +35,25 @@ cluster:
       kubeProxy: {}
       # -- KamajiControlPlane konnectivity configuration
       konnectivity: {}
+    # -- Configure how KamajiControlPlane deployment should be done
+    deployment:
+      # -- Additional metadata as labels and annotations
+      additionalMetadata: 
+        labels: {}
+        annotations: {}
+      # -- Pods Additional metadata as labels and annotations
+      podAdditionalMetadata:
+        labels: {}
+        annotations: {}
+      # -- Affinity scheduling rules
+      affinity: {}
+      # -- Tolerations for scheduling
+      tolerations: []
+      # -- NodeSelector for scheduling
+      nodeSelector:
+        kubernetes.io/os: linux
+      # -- TopologySpreadConstraints for scheduling
+      topologySpreadConstraints: []
     kubelet:
       # -- kubelet cgroupfs configuration
       cgroupfs: systemd
@@ -52,7 +71,7 @@ cluster:
       # serviceAddress: "10.10.10.120"
       # When using MetalLB to expose the Control Plane, set as the following to specify a specific IP address for the service
       # serviceAnnotations:
-      #   metallb.universe.tf/loadBalancerIPs: "10.10.10.120"
+      #   metallb.io/loadBalancerIPs: "10.10.10.120"
       # -- Labels to use for the control plane service
       serviceLabels: {}
       # -- List of additional Subject Alternative Names to use for the API Server serving certificate