CASMPET-7093 Adjust image extraction to cover cray-service/pgbouncer #3462
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.
Summary and Scope
It appears image
pgbouncer:master-21
, removed with CASMPET-7010, is still used byspire
andcray-spire
charts. The reason why it's not detected automatically by csm build is:It's coming from cray-service dependency, not directly from spire/cray-spire chart - this is why annotation properly set on cray-service chart is not being used.
In helm template, it's set into custom "posgresql" resource, not into one of k8s standard resources, which is using non standard field "dockerImage" instead of just "image":
Instead of referring image explicitly in
docker/index.yaml
, we adjust image extraction logic to look not onlyimage:
field in output ofhelm template
, but alsodockerImage:
. This way image introcued by cray-service chart is detected.Issues and Related PRs
Testing
Tested on:
Test description:
After
make validate-images
local run, imagepgbouncer:master-21
is successfully recorded along withpgbouncer:master-22
: