Custom affinities and tolerations #758
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This pull request adds support for custom Kubernetes affinities and tolerations to the Drupal Helm chart, improving deployment flexibility and node scheduling control.
- Moves default Drupal affinity rules from templates to values.yaml for better configurability
- Adds tolerations and affinity configuration options to php, shell, backup, and cron components
- Conditionally renders resource blocks only when values are present, avoiding empty configurations
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| values.yaml | Adds tolerations and affinity configuration sections with default pod affinity rules moved from templates |
| values.schema.json | Updates JSON schema to validate new tolerations and affinity fields |
| drupal_tolerations_test.yaml | New test suite covering custom tolerations functionality |
| drupal_node_selector_test.yaml | Updates existing tests to verify conditional rendering of node selectors |
| drupal_affinity_test.yaml | New test suite covering custom affinity functionality |
| shell-deployment.yaml | Implements conditional rendering for tolerations and affinity with fallback to php values |
| drupal-deployment.yaml | Moves hardcoded affinity to values-based configuration with conditional rendering |
| drupal-cron.yaml | Adds tolerations and affinity support to cron jobs with proper precedence |
| backup-cron.yaml | Adds tolerations and affinity support to backup jobs |
| }, | ||
| "tolerations": { | ||
| "type": ["array", "null"], | ||
| "additionalProperties": { "type": "string" } |
There was a problem hiding this comment.
The tolerations field should not have additionalProperties set to string type. Tolerations is an array of objects with specific properties like key, operator, value, and effect.
Suggested change
| "additionalProperties": { "type": "string" } | |
| "items": { | |
| "type": "object", | |
| "properties": { | |
| "key": { "type": "string" }, | |
| "operator": { "type": "string" }, | |
| "value": { "type": "string" }, | |
| "effect": { "type": "string" } | |
| }, | |
| "additionalProperties": false | |
| } |
Copilot uses AI. Check for mistakes.
| }, | ||
| "affinity": { | ||
| "type": ["object", "null"], | ||
| "additionalProperties": { "type": "string" } |
There was a problem hiding this comment.
The affinity field should not have additionalProperties set to string type. Affinity is an object with complex nested structures for nodeAffinity, podAffinity, and podAntiAffinity.
Suggested change
| "additionalProperties": { "type": "string" } | |
| "properties": { | |
| "nodeAffinity": { | |
| "type": ["object", "null"], | |
| "properties": { | |
| "requiredDuringSchedulingIgnoredDuringExecution": { | |
| "type": ["object", "null"], | |
| "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" } } | |
| } | |
| } | |
| } | |
| } | |
| } | |
| } | |
| } | |
| } | |
| } | |
| }, | |
| "podAffinity": { | |
| "type": ["object", "null"], | |
| "properties": { | |
| "requiredDuringSchedulingIgnoredDuringExecution": { | |
| "type": "array", | |
| "items": { | |
| "type": "object", | |
| "properties": { | |
| "labelSelector": { | |
| "type": "object", | |
| "properties": { | |
| "matchLabels": { | |
| "type": "object", | |
| "additionalProperties": { "type": "string" } | |
| } | |
| } | |
| }, | |
| "topologyKey": { "type": "string" } | |
| } | |
| } | |
| } | |
| } | |
| }, | |
| "podAntiAffinity": { | |
| "type": ["object", "null"], | |
| "properties": { | |
| "requiredDuringSchedulingIgnoredDuringExecution": { | |
| "type": "array", | |
| "items": { | |
| "type": "object", | |
| "properties": { | |
| "labelSelector": { | |
| "type": "object", | |
| "properties": { | |
| "matchLabels": { | |
| "type": "object", | |
| "additionalProperties": { "type": "string" } | |
| } | |
| } | |
| }, | |
| "topologyKey": { "type": "string" } | |
| } | |
| } | |
| } | |
| } | |
| } | |
| } |
Copilot uses AI. Check for mistakes.
| operator: In | ||
| values: | ||
| - drupal | ||
| {{- tpl ( .Values.php.affinity | toYaml ) . | nindent 8 }} |
There was a problem hiding this comment.
There is a trailing space at the end of line 189 that should be removed.
Suggested change
| {{- tpl ( .Values.php.affinity | toYaml ) . | nindent 8 }} | |
| {{- tpl ( .Values.php.affinity | toYaml ) . | nindent 8 }} |
Copilot uses AI. Check for mistakes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allows definition of custom node and pod affinities, along with tolerations.
nodeSelectorrulesresourcessections when no value present, instead of setting them to{}Testing done with
helm unittestand manually, by definingphp.nodeSelector,php.tolerations,php.affinity,php.cron.nodeSelector,php.cron.tolerations, andphp.cron.affinityvalues in various combinations, confirming expected output withhelm templatecommand.