search

openstack-k8s-operators / openstack-operator

Meta Operator for OpenStack
https://openstack-k8s-operators.github.io/openstack-operator/
Apache License 2.0
30 stars 77 forks source link

Support storage setting route annotations #830

Closed Akrog closed 5 months ago

Akrog commented 5 months ago

This PR adds support for Cinder, Glance, and Manila to set their route annotations.

Depends-On: https://github.com/openstack-k8s-operators/cinder-operator/pull/396 Depends-On: https://github.com/openstack-k8s-operators/glance-operator/pull/550 Depends-On: https://github.com/openstack-k8s-operators/manila-operator/pull/282

Jira: https://issues.redhat.com/browse/OSPRH-7393 Jira: https://issues.redhat.com/browse/OSPRH-7415

bshephar commented 5 months ago

I don't think depends-on will bump the go.mod versions, which is why we're seeing:

 # github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1
apis/core/v1beta1/openstackcontrolplane_webhook.go:428:25: r.Spec.Cinder.Template.SetDefaultRouteAnnotations undefined (type "github.com/openstack-k8s-operators/cinder-operator/api/v1beta1".CinderSpecCore has no field or method SetDefaultRouteAnnotations)
apis/core/v1beta1/openstackcontrolplane_webhook.go:458:13: glanceAPI.SetDefaultRouteAnnotations undefined (type "github.com/openstack-k8s-operators/glance-operator/api/v1beta1".GlanceAPITemplate has no field or method SetDefaultRouteAnnotations)
apis/core/v1beta1/openstackcontrolplane_webhook.go:483:25: r.Spec.Manila.Template.SetDefaultRouteAnnotations undefined (type "github.com/openstack-k8s-operators/manila-operator/api/v1beta1".ManilaSpecCore has no field or method SetDefaultRouteAnnotations)

Probably need to merge the Depends-On changes, then bump the pseudo versions for each of those operators in the go.mod files here with this change.

Or temporarily add a replace in the go.mod files pointing to your own repo version. But it's probably just easier to merge the other operator changes first, then test here with the updated versions.

Akrog commented 5 months ago

I don't think depends-on will bump the go.mod versions, which is why we're seeing:

 # github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1
apis/core/v1beta1/openstackcontrolplane_webhook.go:428:25: r.Spec.Cinder.Template.SetDefaultRouteAnnotations undefined (type "github.com/openstack-k8s-operators/cinder-operator/api/v1beta1".CinderSpecCore has no field or method SetDefaultRouteAnnotations)
apis/core/v1beta1/openstackcontrolplane_webhook.go:458:13: glanceAPI.SetDefaultRouteAnnotations undefined (type "github.com/openstack-k8s-operators/glance-operator/api/v1beta1".GlanceAPITemplate has no field or method SetDefaultRouteAnnotations)
apis/core/v1beta1/openstackcontrolplane_webhook.go:483:25: r.Spec.Manila.Template.SetDefaultRouteAnnotations undefined (type "github.com/openstack-k8s-operators/manila-operator/api/v1beta1".ManilaSpecCore has no field or method SetDefaultRouteAnnotations)

Probably need to merge the Depends-On changes, then bump the pseudo versions for each of those operators in the go.mod files here with this change.

Or temporarily add a replace in the go.mod files pointing to your own repo version. But it's probably just easier to merge the other operator changes first, then test here with the updated versions.

I'm sorry, forgot to set the WIP flag. I proposed the PR so that reviewers of the cinder, glance, and manila PRs could have the whole picture of how the conde in those operators would be used by the openstack-operator.

pablintino commented 5 months ago

/retest

softwarefactory-project-zuul[bot] commented 5 months ago

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/openstack-operator for 830,121136e7902518fe4db23835ae4f9e305a85ce99

Akrog commented 5 months ago

/retest

softwarefactory-project-zuul[bot] commented 5 months ago

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://review.rdoproject.org/zuul/buildset/9c5e7c01142f4d44b931e3cde65f09a4

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 3h 51m 14s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 40m 05s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 28m 29s :heavy_check_mark: cifmw-data-plane-adoption-osp-17-to-extracted-crc SUCCESS in 2h 49m 37s :x: openstack-operator-tempest-multinode FAILURE in 1h 44m 52s

abays commented 5 months ago

@Akrog KUTTL is failing because it is hitting the webhook defaulting problem we discussed in Slack:

logger.go:42: 23:34:46 | collapsed | Skipping creation of user-supplied namespace: openstack-kuttl-tests
    logger.go:42: 23:34:46 | collapsed/1-deploy-openstack-collapsed-cell | starting test step 1-deploy-openstack-collapsed-cell
    logger.go:42: 23:34:46 | collapsed/1-deploy-openstack-collapsed-cell | running command: [sh -c oc apply -n $NAMESPACE -f ../../../../config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
        ]
    logger.go:42: 23:34:47 | collapsed/1-deploy-openstack-collapsed-cell | The OpenStackControlPlane "openstack-collapsed-cell" is invalid: spec.manila.template.apiTimeout: Invalid value: 0: spec.manila.template.apiTimeout in body should be greater than or equal to 10
    case.go:364: failed in step 1-deploy-openstack-collapsed-cell
    case.go:366: exit status 1
    logger.go:42: 23:34:47 | collapsed | skipping kubernetes event logging
softwarefactory-project-zuul[bot] commented 5 months ago

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://review.rdoproject.org/zuul/buildset/b4bf5b5ee28443f89764a653163c6978

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 53m 38s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 37m 30s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 33m 00s :heavy_check_mark: cifmw-data-plane-adoption-osp-17-to-extracted-crc SUCCESS in 2h 35m 58s :x: openstack-operator-tempest-multinode FAILURE in 1h 49m 58s

fmount commented 5 months ago

@Akrog KUTTL is failing because it is hitting the webhook defaulting problem we discussed in Slack:

logger.go:42: 23:34:46 | collapsed | Skipping creation of user-supplied namespace: openstack-kuttl-tests
    logger.go:42: 23:34:46 | collapsed/1-deploy-openstack-collapsed-cell | starting test step 1-deploy-openstack-collapsed-cell
    logger.go:42: 23:34:46 | collapsed/1-deploy-openstack-collapsed-cell | running command: [sh -c oc apply -n $NAMESPACE -f ../../../../config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
        ]
    logger.go:42: 23:34:47 | collapsed/1-deploy-openstack-collapsed-cell | The OpenStackControlPlane "openstack-collapsed-cell" is invalid: spec.manila.template.apiTimeout: Invalid value: 0: spec.manila.template.apiTimeout in body should be greater than or equal to 10
    case.go:364: failed in step 1-deploy-openstack-collapsed-cell
    case.go:366: exit status 1
    logger.go:42: 23:34:47 | collapsed | skipping kubernetes event logging

I hit the same thing when we did CronJobs with @ASBishop, maybe this manila patch can help to solve this.

Akrog commented 5 months ago

Thanks. I talked with Alan late Friday and he mentioned it. It's in my Monday's TODO 😅

lewisdenny commented 5 months ago

/retest

lewisdenny commented 5 months ago

recheck

karelyatin commented 5 months ago

/lgtm

karelyatin commented 5 months ago

Would need https://github.com/openstack-k8s-operators/openstack-operator/pull/834 first

softwarefactory-project-zuul[bot] commented 5 months ago

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://review.rdoproject.org/zuul/buildset/9bbbd66b8ab54b79a06ae9d21e3f76a5

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 47m 20s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 37m 58s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 34m 02s :heavy_check_mark: cifmw-data-plane-adoption-osp-17-to-extracted-crc SUCCESS in 2h 30m 43s :x: openstack-operator-tempest-multinode FAILURE in 1h 42m 33s

softwarefactory-project-zuul[bot] commented 5 months ago

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/openstack-operator for 830,316a8a535d9ced790307fbd9af5733f44cd3730e

openshift-ci[bot] commented 5 months ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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: - ~~[OWNERS](https://github.com/openstack-k8s-operators/openstack-operator/blob/main/OWNERS)~~ [abays] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
softwarefactory-project-zuul[bot] commented 5 months ago

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://review.rdoproject.org/zuul/buildset/f835baa5dfeb4f6e85b641b0963704d1

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 02m 15s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 38m 24s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 30m 28s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 1h 29m 18s :x: openstack-operator-tempest-multinode FAILURE in 1h 45m 37s

openshift-ci[bot] commented 5 months ago

New changes are detected. LGTM label has been removed.