Add affinity and tolerations to ASOv2 helm chart #3765
Merged
Conversation
This file contains 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
super-harsh
requested review from
davefellows,
theunrepentantgeek,
matthchr and
babbageclunk
as code owners
matthchr
approved these changes
Feb 8, 2024
scripts/v2/generate-helm-manifest.sh
Outdated
| @@ -49,6 +49,10 @@ sed -i "s@$LOCAL_REGISTRY_CONTROLLER_DOCKER_IMAGE@{{.Values.image.repository}}@g | |||
| # Perl multiline replacements - using this because it's tricky to do these sorts of multiline replacements with sed | |||
| perl -0777 -i -pe 's/(template:\n.*metadata:\n.*annotations:\n(\s*))/$1\{\{- if .Values.podAnnotations \}\}\n$2\{\{ toYaml .Values.podAnnotations \}\}\n$2\{\{- end \}\}\n$2/igs' "$GEN_FILES_DIR"/*_deployment_* # Add pod annotations | |||
|
|
|||
| # Affinity and Toleration | |||
| sed -i '/ spec:/a\ {{- with .Values.affinity }}\n affinity:\n {{- toYaml . | nindent 8 }}\n {{- end }}' "$GEN_FILES_DIR"/*_deployment_* | |||
There was a problem hiding this comment.
You might wanna steal the (horrible) perl line above as it captures spaces and so deals with variable indentation?
I assume that you've tested and this works have we have it today... we really should probably fix how we generate the Helm template (might be better to just duplicate stuff, I dunno)
There was a problem hiding this comment.
I'm good with either. Perl looks a bit messy. But good point, it takes care of the spaces.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3765 +/- ##
==========================================
- Coverage 53.54% 53.49% -0.05%
==========================================
Files 1417 1419 +2
Lines 484060 483386 -674
==========================================
- Hits 259177 258603 -574
+ Misses 185651 185629 -22
+ Partials 39232 39154 -78 ☔ View full report in Codecov by Sentry. |
matthchr
approved these changes
Feb 8, 2024
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.
Closes #3646
What this PR does / why we need it:
This PR adds changes to the helm chart generation script to add
AffinityandTolerationsto ASOv2 helm chart. Also updatesvalues.yamlto specify the above.