Skip to content
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

Update openstack-k8s-operators (main) #543

Merged
merged 1 commit into from
Nov 16, 2023
+147 −33
Merged

Update openstack-k8s-operators (main) #543

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
57 changes: 57 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9341,6 +9341,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
nodeSelector:
additionalProperties:
type: string
Expand Down Expand Up @@ -9518,6 +9530,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -9584,6 +9608,9 @@ spec:
serviceUser:
default: octavia
type: string
tenantName:
default: service
type: string
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -9613,6 +9640,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -9679,6 +9718,9 @@ spec:
serviceUser:
default: octavia
type: string
tenantName:
default: service
type: string
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -9708,6 +9750,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -9774,6 +9828,9 @@ spec:
serviceUser:
default: octavia
type: string
tenantName:
default: service
type: string
transportURLSecret:
type: string
required:
Expand Down
10 changes: 5 additions & 5 deletions apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ require (
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231103171435-bb14d998275c
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231115215538-f222043fd9ca
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231115115237-57226ee0d5ee
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231116094235-e5276dc13ac1
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231115155722-c45baeea1005
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843
github.com/rabbitmq/cluster-operator/v2 v2.5.0
Expand Down Expand Up @@ -66,7 +66,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 //indirect
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231114102008-65eb1b13d3a7 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
Expand Down
20 changes: 10 additions & 10 deletions apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,24 +148,24 @@ github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231103151903-a1a0e540408d/go.mod h1:vIDFS1mvMsJ0ICXm2f8Qh+BmQwH/qef+Gq6SIoh4uKM=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7 h1:UEgV9NNx0XbQlwiebhtS4qdt3mPsMs6c8DMyv+i5tBc=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:mxh1HCiMTZm4cAqUK5yPigbZ5JJs3gOVgDVwbTbFAYk=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 h1:3b9GPyCUpbqogAv6j6k1WBQ1a3k7MINQyTaYik3VqNw=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2/go.mod h1:gT47JFLsW0STzgKSsdUMjT9qXEhz3VjoRZsZySWlhTM=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231114102008-65eb1b13d3a7 h1:SqnQcIL0MZ5B+9G1W8fLLNM/HzGzcD5N4Zqoq/dtUmI=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:P5h4fTbYiDZzQBcbKSs8mfXUJ4btTAgzWiB1dIDPGug=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7 h1:TxNYv31HAoHqECk342i1WQNqd8clTKB4iIg2OhgkUvs=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7/go.mod h1:WbaCMjAao8+4/UJAVyzjr2uiI53E3VcDD73FC3D6DM8=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020 h1:+mey+zjv++lniCqIUMpWXIE4FEB1RsmFevt3OsSbOSs=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020/go.mod h1:lbIGM/p24WtV4m5QuOZz7vQQvBE0jQGMEG7FE+gb+Rs=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231115215538-f222043fd9ca h1:M7/FaQ0e2tBuUMGmL8gg+DH+qqlJJnGehRdqELEqptg=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231115215538-f222043fd9ca/go.mod h1:Vr9jEEV0BKX1mp2ut50y2I0LfFutY7CmghVMtGlUETA=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0 h1:hzwSmpdED7Ro0a0VibNrw734uoJE1feCfu1BtEMLems=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0/go.mod h1:2iwM6ykaObuaEbSK0ez3xau9B/rsxIgwWwGyrlVsaWg=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87 h1:KlhTSF+xemciabUbNVKr7aZq+96+C9MFYktPfJM9exo=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87/go.mod h1:0YnQSFwO0nyZQnEizRJOLQxWDZupUsUAXu8SAMilYg4=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef h1:dTRzgL4m6CKSsPndz21Se588UkXS0dBaXXxtU3Q/NaM=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef/go.mod h1:qtb8TCcdCZnL0SEg/JPpc/bsS576zsM/VSBfJxbrNFc=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56 h1:kGO4FrqJ/4yUQd3BJoPwkfPFoLMNLWiRqMqWtuh3tS8=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d h1:141KSQvg9HN6sH2Ny3zlTWHxIuskxqOZkGeUpv81oVE=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d/go.mod h1:PmO/AmeaRjmR7c5rtNt9aNl/fwZBShmhG/fLA4teWh8=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543 h1:CgMWu9K+gPGks064bjnE/y5C85mWswIBKOEFiFUYBzk=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543/go.mod h1:Qt8vSEE7s5mquzVpTNfmM5OwFtyZKxudWRkYwOyKeY0=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231115115237-57226ee0d5ee h1:/D/7qguWuvV6CxAtI0FcEDs9jojoNSeRM/lhfl55Xrs=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231115115237-57226ee0d5ee/go.mod h1:oTRgvqd1tZaAptGaAmi9WzEMJkJs0D3CGNmGYcNFLRo=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231116094235-e5276dc13ac1 h1:qboJZ1ehOITJtEVKuxd87mFGXxa4wZ3Fp9GE4xo9Blg=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231116094235-e5276dc13ac1/go.mod h1:PmO/AmeaRjmR7c5rtNt9aNl/fwZBShmhG/fLA4teWh8=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231115155722-c45baeea1005 h1:Pha5vZRd12kz5N5ModLVCjqvFhnOgyAUMFTwdP/L71s=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231115155722-c45baeea1005/go.mod h1:Qt8vSEE7s5mquzVpTNfmM5OwFtyZKxudWRkYwOyKeY0=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4 h1:U7agXSKns/8BDwASnYnixveikUl4U0VaE3ctCARWxSE=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4/go.mod h1:RcnbLfxey6n8T899uwwVX1i1Jz+U6hWQWuaAZnmTSws=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843 h1:vWG5fEHch0GSj8PxNVYqAAYUboEpqF/VaITxThbSvb8=
Expand Down
57 changes: 57 additions & 0 deletions 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 @@ -9341,6 +9341,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
nodeSelector:
additionalProperties:
type: string
Expand Down Expand Up @@ -9518,6 +9530,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -9584,6 +9608,9 @@ spec:
serviceUser:
default: octavia
type: string
tenantName:
default: service
type: string
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -9613,6 +9640,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -9679,6 +9718,9 @@ spec:
serviceUser:
default: octavia
type: string
tenantName:
default: service
type: string
transportURLSecret:
type: string
required:
Expand Down Expand Up @@ -9708,6 +9750,18 @@ spec:
additionalProperties:
type: string
type: object
lbMgmtNetwork:
default:
manageLbMgmtNetworks: true
subnetIpVersion: 4
properties:
manageLbMgmtNetworks:
default: true
type: boolean
subnetIpVersion:
default: 4
type: integer
type: object
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -9774,6 +9828,9 @@ spec:
serviceUser:
default: octavia
type: string
tenantName:
default: service
type: string
transportURLSecret:
type: string
required:
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/gomega v1.30.0
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231114160640-3c5c40e6cc3a
github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231115091305-8982d0fb88cb
github.com/openstack-k8s-operators/dataplane-operator/api v0.3.1-0.20231116111603-a949f70038f2
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20231113184257-f5f91f9b0986
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231115090205-264277ef61bb
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231115022322-40df8776a641
Expand All @@ -21,16 +21,16 @@ require (
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.0.0-20231114102008-65eb1b13d3a7
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231114102008-65eb1b13d3a7
github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20231114102008-65eb1b13d3a7
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231114124626-250f67f21020
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231115215538-f222043fd9ca
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20231103165533-ad766a5aa6b0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231115061135-28c36ae19f87
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231113083956-daa5310a0fef
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231109201846-2aaafc447f56
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231115115237-57226ee0d5ee
github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20231106183649-b3c6a943b5c1
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20231103155754-959001301bbe
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20230725141229-4ce90d0120fd
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231115081236-a8288bcc7a5d
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231113150933-c15a24565543
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231116094235-e5276dc13ac1
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231115155722-c45baeea1005
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231114120226-5eaef7af17b4
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231114081411-5a92493f3843
github.com/operator-framework/api v0.17.6
Expand Down Expand Up @@ -82,7 +82,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/api v3.9.0+incompatible
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231102083359-58e12a1299b2 //indirect
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231114102008-65eb1b13d3a7 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231114102008-65eb1b13d3a7 //indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
Expand Down
Loading