Skip to content

Consume common templates from lib-common#648

Merged
openshift-merge-bot[bot] merged 2 commits into
openstack-k8s-operators:mainfrom
fmount:templates
May 18, 2026
Merged

Consume common templates from lib-common#648
openshift-merge-bot[bot] merged 2 commits into
openstack-k8s-operators:mainfrom
fmount:templates

Conversation

@fmount
Copy link
Copy Markdown
Contributor

@fmount fmount commented May 14, 2026 •
edited
Loading

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, dprince, fultonj and stuggi May 14, 2026 15:06
@openshift-ci openshift-ci Bot requested a review from ASBishop May 14, 2026 15:06
@fultonj fultonj mentioned this pull request May 14, 2026
Merged
@centosinfra-prod-github-app
Copy link
Copy Markdown

centosinfra-prod-github-app Bot commented May 15, 2026

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/b2b554118da942cd9c2c5d3403fb34b1

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 03m 07s
❌ cinder-operator-kuttl FAILURE in 41m 48s
❌ cinder-operator-tempest FAILURE in 1h 12m 12s

@fmount
Copy link
Copy Markdown
Contributor Author

fmount commented May 15, 2026

sounds like we have good results here [1]

[1] https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/logs//1de/rdoproject.org/1de26802572e495c9af774c7b3bf3704/controller/ci-framework-data/logs/openstack-must-gather/quay-io-openstack-k8s-operators-openstack-must-gather-sha256-70ce4ab587da14dddf23f3816879343650007e91038f935686ab5355e6f2a7a2/namespaces/openstack/secrets/cinder/cinder-config-data.yaml-ssl.conf

@fmount fmount force-pushed the templates branch 2 times, most recently from 4c1b03b to 0ca2ea1 Compare May 18, 2026 09:09
@centosinfra-prod-github-app
Copy link
Copy Markdown

centosinfra-prod-github-app Bot commented May 18, 2026

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/c5074aa9eb924559b3691a2272a475ab

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 31m 28s
❌ cinder-operator-kuttl FAILURE in 39m 47s
❌ cinder-operator-tempest FAILURE in 1h 11m 46s

abays
abays approved these changes May 18, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@abays abays left a comment

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 18, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 18, 2026

[APPROVALNOTIFIER] This PR is APPROVED

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

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

fmount added 2 commits May 18, 2026 15:58
@fmount
Consume common templates from lib-common
77cc618 
Signed-off-by: Francesco Pantano <fpantano@redhat.com>
@fmount
Consume common templates via CommonTemplates field
517ca4d 
Use the new CommonTemplates field in the lib-common Template struct to request
common templates/files (e.g. ssl.conf) from a common location instead of calling
GetCommonTemplates() and merging into CustomData manually.

Signed-off-by: Francesco Pantano <fpantano@redhat.com>
@openshift-ci openshift-ci Bot removed the lgtm label May 18, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 18, 2026

New changes are detected. LGTM label has been removed.

@abays abays added the lgtm label May 18, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 424463f into openstack-k8s-operators:main May 18, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abays abays abays approved these changes

@dprince dprince Awaiting requested review from dprince

@fultonj fultonj Awaiting requested review from fultonj

@stuggi stuggi Awaiting requested review from stuggi

@ASBishop ASBishop Awaiting requested review from ASBishop

Assignees

@abays abays

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@fmount @abays