jedcunningham commented on a change in pull request #20641:
URL: https://github.com/apache/airflow/pull/20641#discussion_r777731406
##########
File path: chart/tests/test_triggerer.py
##########
@@ -145,6 +145,67 @@ def
test_should_create_valid_affinity_tolerations_and_node_selector(self):
docs[0],
)
+ def test_affinity_tolerations_and_node_selector_precedence(self):
+ """When given both global and triggerer affinity etc, triggerer
affinity etc is used"""
+ docs = render_chart(
+ values={
+ "triggerer": {
+ "affinity": {
+ "nodeAffinity": {
+ "requiredDuringSchedulingIgnoredDuringExecution": {
+ "nodeSelectorTerms": [
+ {
+ "matchExpressions": [
+ {"key": "foo", "operator": "In",
"values": ["true"]},
+ ]
+ }
+ ]
+ }
+ }
+ },
+ "tolerations": [
+ {"key": "dynamic-pods", "operator": "Equal", "value":
"true", "effect": "NoSchedule"}
+ ],
+ "nodeSelector": {"type": "ssd"},
+ },
+ "affinity": {
+ "nodeAffinity": {
+ "requiredDuringSchedulingIgnoredDuringExecution": {
+ "nodeSelectorTerms": [
+ {
+ "matchExpressions": [
+ {"key": "not-me", "operator": "In",
"values": ["true"]},
+ ]
+ }
+ ]
+ }
+ }
+ },
+ "tolerations": [
+ {"key": "not-me", "operator": "Equal", "value": "true",
"effect": "NoSchedule"}
+ ],
+ "nodeSelector": {"type": "not-me"},
+ },
+ show_only=["templates/triggerer/triggerer-deployment.yaml"],
+ )
+
+ assert "foo" == jmespath.search(
+ "spec.template.spec.affinity.nodeAffinity."
+ "requiredDuringSchedulingIgnoredDuringExecution."
+ "nodeSelectorTerms[0]."
+ "matchExpressions[0]."
+ "key",
+ docs[0],
+ )
Review comment:
Good point, I admit I was just following the existing tests. Let me look
at this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
