Skip to content

[18.0-fr1] This patch allows Octavia to set its route annotations. #1194

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

Merged
openshift-merge-bot merged 1 commit into from
Nov 20, 2024
Merged

[18.0-fr1] This patch allows Octavia to set its route annotations. #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10926,7 +10926,8 @@ spec:
apacheContainerImage:
type: string
apiTimeout:
type: string
default: 120
type: integer
customServiceConfig:
default: '# add your customization here'
type: string
Expand All @@ -10953,10 +10954,12 @@ spec:
type: string
type: array
createDefaultLbMgmtNetwork:
default: true
type: boolean
lbMgmtRouterGateway:
type: string
manageLbMgmtNetworks:
default: true
type: boolean
type: object
nodeSelector:
Expand All @@ -10965,6 +10968,8 @@ spec:
type: object
octaviaAPI:
properties:
apiTimeout:
type: integer
customServiceConfig:
default: '# add your customization here'
type: string
Expand Down
2 changes: 2 additions & 0 deletions apis/core/v1beta1/openstackcontrolplane_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,8 @@ func (r *OpenStackControlPlane) DefaultServices() {
}

r.Spec.Octavia.Template.Default()
initializeOverrideSpec(&r.Spec.Octavia.APIOverride.Route, true)
r.Spec.Octavia.Template.SetDefaultRouteAnnotations(r.Spec.Octavia.APIOverride.Route.Annotations)
}

// Barbican
Expand Down
2 changes: 1 addition & 1 deletion apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.0
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-294abc29ae85
github.com/openstack-k8s-operators/nova-operator/api v0.5.0
github.com/openstack-k8s-operators/octavia-operator/api v0.5.0
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442
Copy link
Contributor

@gthiemonge gthiemonge Nov 20, 2024

Choose a reason for hiding this comment

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

shouldn't it be 0.5.0-something? how do we check that this version is the right one?

Copy link
Author

@fernandoroyosanchez fernandoroyosanchez Nov 20, 2024

Choose a reason for hiding this comment

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

I get from:

froyo@fedora ~ $ go list -m -json github.com/openstack-k8s-operators/octavia-operator/api@18.0-fr1 | jq '.|"\(.Path) \(.Version)"'
"github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442"

github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.0
github.com/openstack-k8s-operators/ovn-operator/api v0.5.0
github.com/openstack-k8s-operators/placement-operator/api v0.5.0
Expand Down
4 changes: 2 additions & 2 deletions apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-294abc29ae85/go.mod h1:ARxoBFEgQUA+tM6Qu+TNDCArCN3kgG4WBI15pb2b1jc=
github.com/openstack-k8s-operators/nova-operator/api v0.5.0 h1:DQLiGBWYYp7aq1f8/JEb5Xds5oGP1SPuwGuZS+g3Za4=
github.com/openstack-k8s-operators/nova-operator/api v0.5.0/go.mod h1:E3DA4NEoTMqKDdgxEHut63BaHI0fSmRuVTMjGMqx1Z0=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.0 h1:0xkhjYlVvNkFdzNdRfH8dcfqDbIdcRkvL7rwtZJXEcQ=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.0/go.mod h1:6Z+1yna/RM9bCKkwd64pHxGrRpKFEhOtYUt1PDh6/xU=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442 h1:pRY5uDsyG8grNGm2dKTVGtXIX4Bkhlx40CPuWgPPYkg=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442/go.mod h1:6Z+1yna/RM9bCKkwd64pHxGrRpKFEhOtYUt1PDh6/xU=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.0 h1:RpBGZvePBzdksMU606bAUneSzcUdgMEhM6BQSgqqAsI=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.0/go.mod h1:O9pAzpJo2CT+wZgchU/fERxNL23zPR6+KOccviKbSNY=
github.com/openstack-k8s-operators/ovn-operator/api v0.5.0 h1:pREC1L0Da4OUM4uKEakxrly7+7yJaKQuIDs1+EpvbDg=
Expand Down
7 changes: 6 additions & 1 deletion config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10926,7 +10926,8 @@ spec:
apacheContainerImage:
type: string
apiTimeout:
type: string
default: 120
type: integer
customServiceConfig:
default: '# add your customization here'
type: string
Expand All @@ -10953,10 +10954,12 @@ spec:
type: string
type: array
createDefaultLbMgmtNetwork:
default: true
type: boolean
lbMgmtRouterGateway:
type: string
manageLbMgmtNetworks:
default: true
type: boolean
type: object
nodeSelector:
Expand All @@ -10965,6 +10968,8 @@ spec:
type: object
octaviaAPI:
properties:
apiTimeout:
type: integer
customServiceConfig:
default: '# add your customization here'
type: string
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.0
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-294abc29ae85
github.com/openstack-k8s-operators/nova-operator/api v0.5.0
github.com/openstack-k8s-operators/octavia-operator/api v0.5.0
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.0
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
github.com/openstack-k8s-operators/ovn-operator/api v0.5.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-294abc29ae85/go.mod h1:ARxoBFEgQUA+tM6Qu+TNDCArCN3kgG4WBI15pb2b1jc=
github.com/openstack-k8s-operators/nova-operator/api v0.5.0 h1:DQLiGBWYYp7aq1f8/JEb5Xds5oGP1SPuwGuZS+g3Za4=
github.com/openstack-k8s-operators/nova-operator/api v0.5.0/go.mod h1:E3DA4NEoTMqKDdgxEHut63BaHI0fSmRuVTMjGMqx1Z0=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.0 h1:0xkhjYlVvNkFdzNdRfH8dcfqDbIdcRkvL7rwtZJXEcQ=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.0/go.mod h1:6Z+1yna/RM9bCKkwd64pHxGrRpKFEhOtYUt1PDh6/xU=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442 h1:pRY5uDsyG8grNGm2dKTVGtXIX4Bkhlx40CPuWgPPYkg=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442/go.mod h1:6Z+1yna/RM9bCKkwd64pHxGrRpKFEhOtYUt1PDh6/xU=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.0 h1:RpBGZvePBzdksMU606bAUneSzcUdgMEhM6BQSgqqAsI=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.0/go.mod h1:O9pAzpJo2CT+wZgchU/fERxNL23zPR6+KOccviKbSNY=
github.com/openstack-k8s-operators/ovn-operator/api v0.5.0 h1:pREC1L0Da4OUM4uKEakxrly7+7yJaKQuIDs1+EpvbDg=
Expand Down
4 changes: 4 additions & 0 deletions tests/functional/ctlplane/openstackoperator_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,10 @@ var _ = Describe("OpenStackOperator controller", func() {
Expect(OSCtlplane.Spec.Manila.APIOverride.Route).Should(Not(BeNil()))
Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "60s"))
Expect(OSCtlplane.Spec.Manila.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.manila.openstack.org/timeout", "60s"))
//TODO (froyo) Enable these tests when Octavia would be enabled on FTs
//Expect(OSCtlplane.Spec.Octavia.APIOverride.Route).Should(Not(BeNil()))
//Expect(OSCtlplane.Spec.Octavia.APIOverride.Route.Annotations).Should(HaveKeyWithValue("haproxy.router.openshift.io/timeout", "120s"))
//Expect(OSCtlplane.Spec.Octavia.APIOverride.Route.Annotations).Should(HaveKeyWithValue("api.octavia.openstack.org/timeout", "120s"))
})

It("should create selfsigned issuer and public+internal CA and issuer", func() {
Expand Down