Skip to content
New issue

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

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

Already on GitHub? # to your account

Tls tidy #498

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Tls tidy #498

wants to merge 1 commit into from

Conversation

bshephar
Copy link
Collaborator

Move mounts and volumes to dedicated function. This declutters the Deployment logic and makes each component easier to test. Particularly for Heat where we have some challenges with EnvTest and mocking the OpenStack API.

  • Move Volume and VolumeMount creation to dedicated function
  • Move TLS handling to dedicated functions for HeatAPI and HeatCfnAPI
  • Return errors from HeatEngine deployment creation process if any formatting fails.
  • Handle errors in the reconcile flow for HeatEngine controller.

Copy link
Contributor

openshift-ci bot commented Feb 17, 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

Copy link
Contributor

openshift-ci bot commented Feb 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar

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

The pull request process is described here

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

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/heat-operator for 498,882f433d568e050cd943957812708b5654e00125

Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/6f759dda1e054e68b596298a8ac875c9

✔️ openstack-k8s-operators-content-provider SUCCESS in 21m 43s
heat-operator-tempest-multinode RETRY_LIMIT in 3m 04s

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/heat-operator for 498,ed5ef249ff1caa46670e51ea432c70f0ebce9ce4

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/heat-operator for 498,2922c266e614668ac7b1de8e3c1d81a449dfe83b

Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/13570bf914964cd084a67be97521f50a

openstack-k8s-operators-content-provider FAILURE in 14m 08s
⚠️ heat-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

@bshephar bshephar marked this pull request as ready for review February 25, 2025 10:59
@openshift-ci openshift-ci bot requested review from fao89 and frenzyfriday February 25, 2025 10:59
Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/70f9b8bac7334123b1aff994d0cad453

openstack-k8s-operators-content-provider FAILURE in 15m 50s
⚠️ heat-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

@fao89
Copy link
Contributor

fao89 commented Feb 25, 2025

recheck

Copy link

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5395d5cca45c40dbac3b7b906e9b7b3e

openstack-k8s-operators-content-provider FAILURE in 15m 53s
⚠️ heat-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

Copy link
Contributor

openshift-ci bot commented Feb 25, 2025

@bshephar: 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/heat-operator-build-deploy-kuttl 148de74 link true /test heat-operator-build-deploy-kuttl

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

This change splits out the volume and mounts logic into dedicated functions
This ultimately makes the deployment logic more legible and easier to test.

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
@@ -159,3 +137,58 @@ func Deployment(
}
return deployment, nil
}

func createVolumeAndMounts(instance *heatv1beta1.HeatAPI) ([]corev1.Volume, []corev1.VolumeMount, error) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ok, I think this is working now. So, ideally, I would like these to be generic enough that we can use them for each deployment without reimplementing and duplicating the code.

Moving back to draft while I work on that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@bshephar bshephar marked this pull request as draft February 26, 2025 03:51
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants