New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Allow customize service via service.Override and handle endpoint protocol #332

Merged

abays merged 9 commits into openstack-k8s-operators:main from stuggi:handle_ingress_v3

Sep 19, 2023

Contributor

stuggi commented Sep 7, 2023 •

edited

Loading

Allow customize service via service.Override
Adds an OverrideSpec to the Service which allows to customize metadata.Annotations, metadata.Labels and spec of a service. The override values get merged into the object definition created by the operator. This is part of moving the external connection config into the openstack-operator and allows to override the default service created by an operatior with a MetalLB LoadBalancer service spec.

Jira: OSP-26690

[TLS] Add Protocol to endpoint
Adds Protocol to endpoint Data struct with funcs to get the protocol based on the type. If the type is nil, http is considered to match the current behavior.
Add annotations for ingress control
Adds AnnotationIngressCreateKey . Setting this annotation on the service will control the openstack-operator to create a route .

Jira: OSP-26845

Contributor Author

stuggi commented Sep 7, 2023

/hold

stuggi added a commit to stuggi/keystone-operator that referenced this pull request


          Update keystoneapi to use service override

4334b63

Removes creation of routes for keystoneapi as those get done in
the openstack-operator. Via service overrides the parts of the
service can be customized. The service operator adds annotation
to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi mentioned this pull request

Update keystoneapi to use service override openstack-k8s-operators/keystone-operator#307

Merged

stuggi added a commit to stuggi/glance-operator that referenced this pull request


          Update glanceapi to use service override

6f3da2d

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi mentioned this pull request

Update glanceapi to use service override openstack-k8s-operators/glance-operator#309

Merged

stuggi added a commit to stuggi/placement-operator that referenced this pull request


          Update placementapi to use service override

486b243

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi mentioned this pull request

Update placementapi to use service override openstack-k8s-operators/placement-operator#61

Merged

stuggi added a commit to stuggi/cinder-operator that referenced this pull request


          Update cinderapi to use service override

6fe6fbd

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi mentioned this pull request

Update cinderapi to use service override openstack-k8s-operators/cinder-operator#262

Merged

stuggi added a commit to stuggi/neutron-operator that referenced this pull request


          Update neutronapi to use service override

fd4ed88

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi mentioned this pull request

Update neutronapi to use service override openstack-k8s-operators/neutron-operator#204

Merged

stuggi added a commit to stuggi/nova-operator that referenced this pull request


          Update novaapi, novametadata and novanovncproxy to use service override

1e1716b

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/heat-operator that referenced this pull request


          Update heatapi and heatcfnapi to use service override

c8d89e9

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/horizon-operator that referenced this pull request


          Update horizon to use service override

fce6d41

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/manila-operator that referenced this pull request


          Update manilaapi to use service override

e4c4a00

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/swift-operator that referenced this pull request


          Update swiftproxy to use service override

0514a4d

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

This was referenced Sep 7, 2023

Update novaapi, novametadata and novanovncproxy to use service override openstack-k8s-operators/nova-operator#522

Merged

Update heatapi and heatcfnapi to use service override openstack-k8s-operators/heat-operator#238

Merged

Update horizon to use service override openstack-k8s-operators/horizon-operator#212

Merged

Update manilaapi to use service override openstack-k8s-operators/manila-operator#130

Merged

stuggi added a commit to stuggi/manila-operator that referenced this pull request


          Update manilaapi to use service override

a6cf634

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

This was referenced Sep 7, 2023

Update swiftproxy to use service override openstack-k8s-operators/swift-operator#49

Merged

Create several services routes based on annotations on the svc endpoint openstack-k8s-operators/openstack-operator#457

Merged

bogdando reviewed

View reviewed changes

modules/common/route/types.go Show resolved Hide resolved

stuggi added a commit to stuggi/infra-operator that referenced this pull request


          Update dnsmasq to use service override

d15ce66

moving from ExtrenalEndpoints to use ServiceOverride to customize the
service.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

gibizer reviewed

View reviewed changes

modules/common/service/types.go Outdated Show resolved Hide resolved

stuggi added a commit to stuggi/glance-operator that referenced this pull request


          Update glanceapi to use service override

11d8449

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/infra-operator that referenced this pull request


          Update dnsmasq to use service override

84fd307

moving from ExtrenalEndpoints to use ServiceOverride to customize the
service.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi force-pushed the handle_ingress_v3 branch from ddd3b7e to 26ca518 Compare

September 11, 2023 17:01

stuggi added a commit to stuggi/keystone-operator that referenced this pull request


          Update keystoneapi to use service override

be4e1fa

Removes creation of routes for keystoneapi as those get done in
the openstack-operator. Via service overrides the parts of the
service can be customized. The service operator adds annotation
to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/glance-operator that referenced this pull request


          Update glanceapi to use service override

2656dbf

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/placement-operator that referenced this pull request


          Update placementapi to use service override

0175d79

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/cinder-operator that referenced this pull request


          Update cinderapi to use service override

e832fb2

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/neutron-operator that referenced this pull request


          Update neutronapi to use service override

84b3814

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/glance-operator that referenced this pull request


          Update glanceapi to use service override

aa05d80

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/placement-operator that referenced this pull request


          Update placementapi to use service override

822a184

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/neutron-operator that referenced this pull request


          Update neutronapi to use service override

94f32bf

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/nova-operator that referenced this pull request


          Update novaapi, novametadata and novanovncproxy to use service override

4dec9cc

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/heat-operator that referenced this pull request


          Update heatapi and heatcfnapi to use service override

047cc2c

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/horizon-operator that referenced this pull request


          Update horizon to use service override

b0a6e90

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/manila-operator that referenced this pull request


          Update manilaapi to use service override

044c88c

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/swift-operator that referenced this pull request


          Update swiftproxy to use service override

e9286b9

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/nova-operator that referenced this pull request


          Update novaapi, novametadata and novanovncproxy to use service override

9e02270

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/horizon-operator that referenced this pull request


          Update horizon to use service override

8275a9c

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/cinder-operator that referenced this pull request


          Update cinderapi to use service override

16d83ab

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/horizon-operator that referenced this pull request


          Update horizon to use service override

df29559

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/glance-operator that referenced this pull request


          Update glanceapi to use service override

95ff975

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

openshift-merge-robot pushed a commit to openstack-k8s-operators/placement-operator that referenced this pull request


          Update placementapi to use service override

3c99d09

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/swift-operator that referenced this pull request


          Update swiftproxy to use service override

dea379d

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/manila-operator that referenced this pull request


          Update manilaapi to use service override

3a8f038

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/ironic-operator that referenced this pull request


          Update ironicapi and ironicinspector to use service override

c208be5

Removes creation of routes for ironicapi and ironicinspector as
those get done in the openstack-operator. Via service overrides
the parts of the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Note: does not cover the routes being created by the ironicconductor
and ironicinspector for the httpboot service when there is no inspection
network

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/octavia-operator that referenced this pull request


          Update octaviaapi to use service override

b35946d

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/nova-operator that referenced this pull request


          Update novaapi, novametadata and novanovncproxy to use service override

6a5e52b

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/octavia-operator that referenced this pull request


          Update octaviaapi to use service override

b16a653

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/manila-operator that referenced this pull request


          Update manilaapi to use service override

e048f84

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/glance-operator that referenced this pull request


          Update glanceapi to use service override

82f0dc7

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

openshift-merge-robot pushed a commit to openstack-k8s-operators/nova-operator that referenced this pull request


          Update novaapi, novametadata and novanovncproxy to use service override

4a535c8

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/ironic-operator that referenced this pull request


          Update ironicapi and ironicinspector to use service override

bb4bc9a

Removes creation of routes for ironicapi and ironicinspector as
those get done in the openstack-operator. Via service overrides
the parts of the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Note: does not cover the routes being created by the ironicconductor
and ironicinspector for the httpboot service when there is no inspection
network

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

stuggi added a commit to stuggi/octavia-operator that referenced this pull request


          Update octaviaapi to use service override

1c3c336

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

bshephar pushed a commit to bshephar/heat-operator that referenced this pull request


          Update heatapi and heatcfnapi to use service override

44dbacb

Removes creation of routes.Those get done in the openstack-operator.
Via service overrides the service can be customized. The service operator
adds annotation to the service which needs to be exposed as a route.

Jira: OSP-26690

Depends-On: openstack-k8s-operators/lib-common#332

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

Reviewers

bogdando bogdando left review comments

fmount fmount left review comments

gibizer gibizer left review comments

abays abays approved these changes

dprince Awaiting requested review from dprince

olliewalsh Awaiting requested review from olliewalsh

karelyatin Awaiting requested review from karelyatin

bshephar Awaiting requested review from bshephar

Labels

None yet