Include labelSelector for affinity and topologySpreadConstraints

[pvickery-ParamountCommerce]

Description

The labelSelector is used to track the pods that are used for the topologySpreadConstraints calculation. matchLabelKeys is used to only use the pods in the current version of the deployments replicaset.

I believe the following message isn't true before this PR.

external-dns/charts/external-dns/values.yaml

Lines 155 to 156 in 1ceaf79

	# -- Topology spread constraints for `Pod` [scheduling](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/). If an explicit label selector is not provided one will be created from the pod selector labels.
	topologySpreadConstraints: []

More details about matchLabelKeys can be found here:

• https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/
• https://kubernetes.io/blog/2023/04/17/fine-grained-pod-topology-spread-features-beta/#kep-3243-respect-pod-topology-spread-after-rolling-upgrades
• https://pauldally.medium.com/the-most-common-reason-your-topologyspreadconstraint-isnt-working-fb9ce25297cd

Checklist

• Unit tests updated
• End user documentation updated

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: pvickery-ParamountCommerce / name: Patrick Vickery (844bab3)

[k8s-ci-robot]

Welcome @pvickery-ParamountCommerce!

It looks like this is your first PR to kubernetes-sigs/external-dns 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/external-dns has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @pvickery-ParamountCommerce. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[stevehipwell]

Thanks for the PR @pvickery-ParamountCommerce. The comments in values.yaml were incorrectly copied from a chart where this had been implemented. Did you also see that the same comment was present for affinity? I think we have the following 3 options:

1. Change the comments and don't add default label selectors
2. Implement your pattern for affinity
3. Implement the other pattern

FYI you also need to add a chart CHANGELOG entry under [UNRELEASED].

[pvickery-ParamountCommerce]

Thanks for the PR @pvickery-ParamountCommerce. The comments in values.yaml were incorrectly copied from a chart where this had been implemented. Did you also see that the same comment was present for affinity? I think we have the following 3 options:

1. Change the comments and don't add default label selectors

2. Implement your pattern for `affinity`

3. Implement the other pattern

FYI you also need to add a chart CHANGELOG entry under [UNRELEASED].

Thanks for the feedback @stevehipwell!
I have implemented the default label selectors in all blocks for podaffinity. I found it to be rather repetitive so let me know if you have any suggestions to simplify it.

I used these values to test affinity when automatically adding the labelSelector, and uncommented the rest to test when the user supplied values should be used.

affinity:
  podAffinity:
    preferredDuringSchedulingIgnoredDuringExecution:
      - weight: 100
        podAffinityTerm:
          topologyKey : "kubernetes.io/hostname"
        # labelSelector:
        #   matchExpressions:
        #     - key: app.kubernetes.io/name
        #       operator: In
        #       values:
        #         - test
    requiredDuringSchedulingIgnoredDuringExecution:
      - topologyKey : "kubernetes.io/hostname"
        # labelSelector:
        #   matchExpressions:
        #     - key: app.kubernetes.io/name
        #       operator: In
        #       values:
        #         - test
  podAntiAffinity:
    preferredDuringSchedulingIgnoredDuringExecution:
      - weight: 100
        podAffinityTerm:
          topologyKey : "kubernetes.io/hostname"
          # labelSelector:
          #   matchExpressions:
          #     - key: app.kubernetes.io/name
          #       operator: In
          #       values:
          #         - test
    requiredDuringSchedulingIgnoredDuringExecution:
      - topologyKey : "kubernetes.io/hostname"
        # labelSelector:
        #   matchExpressions:
        #     - key: app.kubernetes.io/name
        #       operator: In
        #       values:
        #         - test

[stevehipwell]

Could you move the basic structure out into the deployment template, use smaller template functions and make use of with? Something like below (untested).

    {{- with .Values.affinity }}
      affinity:
      {{- with .podAffinity }}
        podAffinity:
        {{- with preferredDuringSchedulingIgnoredDuringExecution }}
        {{- range . }}
        {{- if dig "podAffinityTerm" "labelSelector" nil . }}
          {{- toYaml (list .) | nindent 10 }}
        {{- else }}
          {{ include "external-dns.podAffinityPreferred" . }}
        {{- end }}
        {{- end }}
        {{- end }}
      {{- end }}
      {{- end }}

[pvickery-ParamountCommerce]

Thanks @stevehipwell, that is a good idea! I've updated it with your suggestion and have tested it locally

[stevehipwell]

Could you also look at updating the charts/ci/ci-values.yaml to include coverage for these changes? FYI CI uses a standard Kind cluster .

If this isn't possible we could look at adding a kubconform step to validate the templates.

[pvickery-ParamountCommerce]

Thanks @stevehipwell and sorry for the delay!
I have added my test values to the ci values to setup pod (anti-)affinity and topologySpreadConstraints

[stevehipwell]

/ok-to-test

[stevehipwell]

@pvickery-ParamountCommerce this looks to be failing the lint.

[pvickery-ParamountCommerce]

Ah shoot! I've updated it again to pass the linting checks. preferredDuringSchedulingIgnoredDuringExecution and requiredDuringSchedulingIgnoredDuringExecution values need to be in an array and was just in an object before

[stevehipwell]

Just a couple of comments.

[pvickery-ParamountCommerce]

One more push to fix those findings. I also updatee how the labelSelector is added to remove a useless newline. Thanks again for all the help @stevehipwell!

{{- if dig "labelSelector" nil . }}
-   - {{- toYaml . | nindent 16 }}
+   - {{ toYaml . | indent 16 | trim }}

[stevehipwell]

Thanks @pvickery-ParamountCommerce!

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stevehipwell

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• charts/OWNERS [stevehipwell]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment