Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CASMPET-7093 Adjust image extraction to cover cray-service/pgbouncer #3462

Merged
merged 1 commit into from
Jun 7, 2024

Conversation

mtupitsyn
Copy link
Contributor

Summary and Scope

It appears image pgbouncer:master-21, removed with CASMPET-7010, is still used by spire and cray-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":

    apiVersion: "acid.zalan.do/v1"
    kind: postgresql
    ...
    spec:
    ...
      enableConnectionPooler: true
      connectionPooler:
        numberOfInstances: 3
        mode: "session"
        dockerImage: "artifactory.algol60.net/csm-docker/stable/registry.opensource.zalan.do/acid/pgbouncer:master-21" 
    

Instead of referring image explicitly in docker/index.yaml, we adjust image extraction logic to look not only image: field in output of helm template, but also dockerImage:. This way image introcued by cray-service chart is detected.

Issues and Related PRs

Testing

Tested on:

  • Local development environment

Test description:

After make validate-images local run, image pgbouncer:master-21 is successfully recorded along with pgbouncer:master-22:

$ grep pgbouncer build/images/chartmap.csv
platform,csm-algol60/cray-postgres-operator:1.8.5,artifactory.algol60.net/csm-docker/stable/registry.opensource.zalan.do/acid/pgbouncer:master-22
sysmgmt,csm-algol60/cray-spire:1.6.1,artifactory.algol60.net/csm-docker/stable/registry.opensource.zalan.do/acid/pgbouncer:master-21
sysmgmt,csm-algol60/spire:2.15.1,artifactory.algol60.net/csm-docker/stable/registry.opensource.zalan.do/acid/pgbouncer:master-21

@mtupitsyn mtupitsyn requested a review from a team as a code owner June 7, 2024 18:06
@mtupitsyn
Copy link
Contributor Author

/backport release/1.5

Copy link

github-actions bot commented Jun 7, 2024

Backporting into branch release/1.5 was successful. New PR: #3463

@mtupitsyn mtupitsyn merged commit 7472675 into release/1.6 Jun 7, 2024
2 checks passed
@mtupitsyn mtupitsyn deleted the feature/CASMPET-7093 branch June 7, 2024 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants