Skip to content

Make sure we reconcile heat-engine secrets#521

Merged
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom
bshephar:heat-engine-config
Apr 22, 2025
Merged

Make sure we reconcile heat-engine secrets#521
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom
bshephar:heat-engine-config

Conversation

@bshephar
Copy link
Contributor

We trigger reconciles for each controllers based on different events. This can lead to a situation where Heat engine - which doesn't have the same number of events that will trigger a reconcile, becomes out of sync with the other controllers. For example, the configs which are essentially the same but updated with https endpoints can be synced by the HeatAPI and HeatCfnApi controllers first, before the HeatEngine controller finally catches up. In this interval of time the heat-engine process will fail since it's trying to speak to non https endpoints instead of the correct https ones.

Jira: https://issues.redhat.com/browse/OSPCIX-795

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 22, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@bshephar bshephar marked this pull request as ready for review April 22, 2025 08:14
@openshift-ci openshift-ci bot requested review from olliewalsh and slagle April 22, 2025 08:14
@bshephar bshephar marked this pull request as draft April 22, 2025 08:14
@bshephar bshephar force-pushed the heat-engine-config branch from 41760b4 to 086fc0c Compare April 22, 2025 08:57
@bshephar bshephar marked this pull request as ready for review April 22, 2025 08:57
@openshift-ci openshift-ci bot requested review from abays and dprince April 22, 2025 08:57
We trigger reconciles for each controller based on different events.
This can lead to a situation where Heat engine - which doesn't have
the same number of events that will trigger a reconcile, becomes out
of sync with the other controllers. For example, the configs which are
essentially the same but updated with https endpoints can be synced
by the HeatAPI and HeatCfnApi controllers first, before the
HeatEngine controller finally catches up. In this interval of time
the heat-engine process will fail since it's trying to speak to non
https endpoints instead of the correct https ones.

This change switches the configMapFn() Watches function to secretFn
and switches out instances where we were watching for ConfigMap changes
to be watching for secret changes. We don't use ConfigMaps anymore in
Heat Operator, so this change was left over from an oversight rather
than functionally necessary.

Jira: https://issues.redhat.com/browse/OSPCIX-795
Signed-off-by: Brendan Shephard <bshephar@redhat.com>
@bshephar bshephar force-pushed the heat-engine-config branch from 086fc0c to 3fd2561 Compare April 22, 2025 09:04
Copy link
Contributor

@stuggi stuggi 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
Copy link
Contributor

openshift-ci bot commented Apr 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar, 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 8c44e58 into openstack-k8s-operators:main Apr 22, 2025
7 checks passed
@stuggi
Copy link
Contributor

stuggi commented Apr 22, 2025

/cherry-pick 18.0-fr2

@openshift-cherrypick-robot

@stuggi: new pull request created: #522

Details

In response to this:

/cherry-pick 18.0-fr2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants