Update octavia to include availabilityZone changes

Related-Issue: OSPRH-6901
karelyatin · May 15, 2024 · 87642a8 · 87642a8
1 parent 30a6afb
commit 87642a8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -10381,6 +10381,10 @@ spec:
                           manageLbMgmtNetworks: true
                           subnetIpVersion: 4
                         properties:
+                          availabilityZones:
+                            items:
+                              type: string
+                            type: array
                           manageLbMgmtNetworks:
                             default: true
                             type: boolean

diff --git a/apis/go.mod b/apis/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b
 	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430133004-fa4d7320c38b
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255
 	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949
 	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187
 	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf

diff --git a/apis/go.sum b/apis/go.sum
@@ -105,8 +105,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b/go.mod h1:dXRdA2lH7Ibo1ZexlLuUBCeunw85D7s2FK/W6Xes2/c=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4 h1:rsHDlSJKVtH8Sj0FqWElNOJ8w733OMSrPpE7Zudr/eY=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4/go.mod h1:zk1v1pEqPlfRucHijswLTeWHb/Qsn9hEy35pePBb1uw=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430133004-fa4d7320c38b h1:OTDAgRmwXkp4Zvg1PWvL9ShSIy/iRw491keO+zVzT5Y=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430133004-fa4d7320c38b/go.mod h1:Dpn/imi5Z+dLSra5mkP1TCxwLChqt9wQOaP1EupV1QY=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255 h1:E6ZDsyIZoL5xVqpm09CCz/L1YyRUoZ5+rsuNJH7adVA=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255/go.mod h1:Dpn/imi5Z+dLSra5mkP1TCxwLChqt9wQOaP1EupV1QY=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949 h1:lG8eZOJVk5cOqZZNrvvIDH4LSivUpQPub90OyZX2Lvg=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949/go.mod h1:xChesp2Z/GkHcWo/FJkUNVlQdfwOMmMhkEnh+AFnlaE=
 github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187 h1:XFmZIf1EFOov5Cuwhuby5dKR/oERmYZudykcpYd3kvA=

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -10381,6 +10381,10 @@ spec:
                           manageLbMgmtNetworks: true
                           subnetIpVersion: 4
                         properties:
+                          availabilityZones:
+                            items:
+                              type: string
+                            type: array
                           manageLbMgmtNetworks:
                             default: true
                             type: boolean

diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b
 	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430133004-fa4d7320c38b
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255
 	github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240429132808-d4644304a583
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240429153157-9a04c56acdf5
 	github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240429122434-ae5a142f5a54

diff --git a/go.sum b/go.sum
@@ -134,8 +134,8 @@ github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b/go.mod h1:dXRdA2lH7Ibo1ZexlLuUBCeunw85D7s2FK/W6Xes2/c=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4 h1:rsHDlSJKVtH8Sj0FqWElNOJ8w733OMSrPpE7Zudr/eY=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4/go.mod h1:zk1v1pEqPlfRucHijswLTeWHb/Qsn9hEy35pePBb1uw=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430133004-fa4d7320c38b h1:OTDAgRmwXkp4Zvg1PWvL9ShSIy/iRw491keO+zVzT5Y=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240430133004-fa4d7320c38b/go.mod h1:Dpn/imi5Z+dLSra5mkP1TCxwLChqt9wQOaP1EupV1QY=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255 h1:E6ZDsyIZoL5xVqpm09CCz/L1YyRUoZ5+rsuNJH7adVA=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255/go.mod h1:Dpn/imi5Z+dLSra5mkP1TCxwLChqt9wQOaP1EupV1QY=
 github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240429132808-d4644304a583 h1:LSE6Yi6RhEtaDtQkYLScbOOeNlg4A3s77qskYDu1hUw=
 github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.1-0.20240429132808-d4644304a583/go.mod h1:C834IlAqiEDSgMDaIzeDgxozRhAy82rp5qeiEfC4lrI=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.1-0.20240429153157-9a04c56acdf5 h1:uRZxszC7fq9MnIDO+k4oepKA6NyH2j/DhJO3VcC/Bc8=