Skip to content

Commit

Permalink
Switches the merging logic to using the override as the basis (#21711)
Browse files Browse the repository at this point in the history
Ensures additionalProperties are the lowest precedence

Also removes support for setting the image pull secrets via the
unsupported podtemplate

Closes #10503
  • Loading branch information
shawkins committed Jul 17, 2023
1 parent a397190 commit c7920ee
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 278 deletions.
Loading

0 comments on commit c7920ee

Please sign in to comment.