Skip to content

Consume common templates via CommonTemplates field#382

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
fmount:templates
May 20, 2026
Merged

Consume common templates via CommonTemplates field#382
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
fmount:templates

Conversation

@fmount

@fmount fmount commented May 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

The ssl.conf httpd configuration is duplicated across service operators.
This patch removes the local copy and consumes it from lib-common.

Jira: OSPRH-30239

@fmount fmount requested review from abays, stuggi and xek May 18, 2026 14:55
@openshift-ci openshift-ci Bot requested a review from jagee May 18, 2026 14:56
@fmount fmount requested review from vakwetu and removed request for jagee May 18, 2026 14:56
@fmount

fmount commented May 18, 2026

Copy link
Copy Markdown
Contributor Author

/test barbican-operator-build-deploy-kuttl

@stuggi

stuggi commented May 19, 2026

Copy link
Copy Markdown
Contributor

/retest

@fmount

fmount commented May 19, 2026

Copy link
Copy Markdown
Contributor Author

/test barbican-operator-build-deploy-kuttl

@abays

abays commented May 19, 2026

Copy link
Copy Markdown
Contributor

@fmount: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:
Test name Commit Details Required Rerun command
ci/prow/barbican-operator-build-deploy-kuttl aa50e09 link true /test barbican-operator-build-deploy-kuttl

Full PR test history. Your PR dashboard.
Details

The past couple failures seem to be genuine. The Barbican resource fails to reach the Ready state: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openstack-k8s-operators_barbican-operator/382/pull-ci-openstack-k8s-operators-barbican-operator-main-barbican-operator-build-deploy-kuttl/2056613491602624512/artifacts/barbican-operator-build-deploy-kuttl/openstack-k8s-operators-gather/artifacts/must-gather/quay-io-openstack-k8s-operators-openstack-must-gather-sha256-70ce4ab587da14dddf23f3816879343650007e91038f935686ab5355e6f2a7a2/namespaces/openstack/barbican.openstack.org/barbicans/barbican.yaml

@fmount

fmount commented May 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@fmount: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:
Test name Commit Details Required Rerun command
ci/prow/barbican-operator-build-deploy-kuttl aa50e09 link true /test barbican-operator-build-deploy-kuttl
Full PR test history. Your PR dashboard.
Details

The past couple failures seem to be genuine. The Barbican resource fails to reach the Ready state: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openstack-k8s-operators_barbican-operator/382/pull-ci-openstack-k8s-operators-barbican-operator-main-barbican-operator-build-deploy-kuttl/2056613491602624512/artifacts/barbican-operator-build-deploy-kuttl/openstack-k8s-operators-gather/artifacts/must-gather/quay-io-openstack-k8s-operators-openstack-must-gather-sha256-70ce4ab587da14dddf23f3816879343650007e91038f935686ab5355e6f2a7a2/namespaces/openstack/barbican.openstack.org/barbicans/barbican.yaml

Right, I was looking into that and I see:

026-05-19T07:07:34.468980563Z   File "/usr/lib/python3.9/site-packages/oslo_config/cfg.py", line 1628, in _parse_file
2026-05-19T07:07:34.469169368Z     raise ConfigFileParseError(pe.filename, str(pe))
2026-05-19T07:07:34.469169368Z oslo_config.cfg.ConfigFileParseError: Failed to parse /etc/barbican/barbican.conf.d/ssl.conf: at /etc/barbican/barbican.conf.d/ssl.conf:1, No ':' or '=' found in assignment: '<IfModule mod_ssl.c>'

in https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openstack-k8s-operators_barbican-operator/382/pull-ci-openstack-k8s-operators-barbican-operator-main-barbican-operator-build-deploy-kuttl/2056613491602624512/artifacts/barbican-operator-build-deploy-kuttl/openstack-k8s-operators-gather/artifacts/must-gather/quay-io-openstack-k8s-operators-openstack-must-gather-sha256-70ce4ab587da14dddf23f3816879343650007e91038f935686ab5355e6f2a7a2/namespaces/openstack/pods/barbican-keystone-listener-5d4c98cccb-jrg2h/barbican-keystone-listener/barbican-keystone-listener/logs/previous.log

Looks like the barbican-keystone-listener is crashing because ssl.conf (an Apache config) is being placed into /etc/barbican/barbican.conf.d/, where oslo_config tries to parse it as an INI file and fails.
I need to expose (like I did with nova) the commonTemplates parameter to not load unwanted files in unrelated components.

@fmount

fmount commented May 19, 2026

Copy link
Copy Markdown
Contributor Author 
Uploading finished
Error from server (InternalError): Internal error occurred: error getting push/pull secrets for service account openstack/builder: rpc error: code = Unavailable desc = error reading from server: read tcp 10.0.2.78:58296->10.0.1.55:2379: read: connection timed out

rechecking

@fmount

fmount commented May 19, 2026

Copy link
Copy Markdown
Contributor Author

/test barbican-operator-build-deploy-kuttl

1 similar comment
@fmount

fmount commented May 19, 2026

Copy link
Copy Markdown
Contributor Author

/test barbican-operator-build-deploy-kuttl

@fmount

fmount commented May 19, 2026

Copy link
Copy Markdown
Contributor Author

/retest

stuggi
stuggi reviewed May 19, 2026
View reviewed changes
Comment thread internal/controller/barbicanapi_controller.go Outdated
@fmount @claude
Consume common ssl.conf via CommonTemplates field
dbe39d3 
Use the new CommonTemplates field in the Template struct to request
ssl.conf from lib-common instead of shipping a local copy.

Co-Authored-By: Claude Opus <noreply@anthropic.com>
Signed-off-by: Francesco Pantano <fpantano@redhat.com>
@fmount fmount requested a review from stuggi May 19, 2026 17:49
stuggi
stuggi approved these changes May 20, 2026
View reviewed changes

@stuggi stuggi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label May 20, 2026
@openshift-ci

openshift-ci Bot commented May 20, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fmount, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot Bot merged commit 4e61969 into openstack-k8s-operators:main May 20, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stuggi stuggi stuggi approved these changes
@xek xek Awaiting requested review from xek
@abays abays Awaiting requested review from abays
@vakwetu vakwetu Awaiting requested review from vakwetu

Assignees

@stuggi stuggi

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fmount @stuggi @abays