Fix soft global nodeAffinity

Benedikt Feinrequested to merge
b-fein/gitlab:fix-preferred-node-affinity into master
  • Please check this box if this contribution uses AI-generated content (including content generated by GitLab Duo features) as outlined in the GitLab DCO & CLA. As a benefit of being a GitLab Community Contributor, you can request access to GitLab Duo.

What does this MR do?

The syntax for preferred scheduling is not the same as for required ones. The template helpers did not apply this distinction correctly leading to invalid manifests in case a global nodeAffinity: soft was specified in the Helm values.

Kubernetes API specification: https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#NodeAffinity A preferredDuringSchedulingIgnoredDuringExecution is of type []PreferredSchedulingTerm, while a requiredDuringSchedulingIgnoredDuringExecution is a NodeSelector.

Example from https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity that shows the differences:

spec:
  affinity:
    nodeAffinity:
      requiredDuringSchedulingIgnoredDuringExecution:
        nodeSelectorTerms:
        - matchExpressions:
          - key: topology.kubernetes.io/zone
            operator: In
            values:
            - antarctica-east1
            - antarctica-west1
      preferredDuringSchedulingIgnoredDuringExecution:
      - weight: 1
        preference:
          matchExpressions:
          - key: another-node-label-key
            operator: In
            values:
            - another-node-label-value

Related issues

Author checklist

For general guidance, please follow our Contributing guide.

Required

For anything in this list which will not be completed, please provide a reason in the MR discussion.

  • Merge Request Title and Description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • MR has a green pipeline.
  • Documentation created/updated.
  • Tests added/updated, and test plan for scenarios not covered by automated tests.
  • Equivalent MR/issue for omnibus-gitlab opened.

Reviewers checklist

Edited by Clemens Beck

Merge request reports