Skip to content

Commit

Permalink
Update ovn
Browse files Browse the repository at this point in the history
  • Loading branch information
@olliewalsh
olliewalsh committed Oct 3, 2024
1 parent f3cd390 commit 36aff5a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/openstack-k8s-operators/infra-operator/apis v0.4.1-0.20240917142819-7e2d29023d36
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20240913082854-93e827d3a905
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240906103150-990fe66f2e5d
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240926101719-8fc1c3da53f7
github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/manila-operator/api v0.4.1-0.20240913211808-8f4db35b6c77
github.com/openstack-k8s-operators/mariadb-operator/api v0.4.1-0.20240913150207-a06f656e440b
Expand Down
4 changes: 2 additions & 2 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20240913082854-9
github.com/openstack-k8s-operators/ironic-operator/api v0.4.1-0.20240913082854-93e827d3a905/go.mod h1:iQq0r9XaY6+AN9LaJIvhoetuOwnaGIhU0XkQvHLFT9M=
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240906103150-990fe66f2e5d h1:PbTZo4RCo+RFiGZ0q/rllUXoUtxgtWAh4V0IUe3aW5k=
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240906103150-990fe66f2e5d/go.mod h1:5glxxSboJjYvNrNd6qibT8cEkbxV+6E9MZKI+eFqBAs=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240910122823-bdcfe881513b h1:tf8jULJWDGSpnZRcsHXHtijrIgo1jIoxkwvcwBfWM+4=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240910122823-bdcfe881513b/go.mod h1:6zxa5xg9uvpObVKFSJa/SA+vDDlgh0Q1aswxDB2XbxU=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240926101719-8fc1c3da53f7 h1:tMUnieWnvtEU/7gISSfckkkCmWmVqytVykEfye1PbU8=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240926101719-8fc1c3da53f7/go.mod h1:3JoOAuMiQYhNcXUipvOhx9mmGnQ3owRwORoxqjFFmS8=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240910122823-bdcfe881513b h1:VZgpwJK6JO0wJaRRozELe6JulQsA5SxZFX+OyLqA6lI=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240910122823-bdcfe881513b/go.mod h1:GezFEV/4gMFkwL+tnM0OzYBRqzKJghPJL+gKcNVAj/Y=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240910122823-bdcfe881513b h1:bnJhwLTGLahNdNlUTOAwiZeU+Ojr81Xi8+Zp7iD1hCg=
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/openstack-k8s-operators/keystone-operator/api v0.4.1-0.20240906103150-990fe66f2e5d
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240926101719-8fc1c3da53f7
github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/lib-common/modules/test v0.4.1-0.20240910122823-bdcfe881513b
github.com/openstack-k8s-operators/manila-operator/api v0.4.1-0.20240913211808-8f4db35b6c77
Expand Down Expand Up @@ -126,3 +126,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231

// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 //allow-merging

replace github.com/openstack-k8s-operators/ovn-operator/api => github.com/olliewalsh/ovn-operator/api v0.0.0-20241003144908-ddb2e9e03a35
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/olliewalsh/ovn-operator/api v0.0.0-20241003144908-ddb2e9e03a35 h1:JPMma1cyCinlTYkHEOs93LCkSi/RTTUZUr+Pri81nLs=
github.com/olliewalsh/ovn-operator/api v0.0.0-20241003144908-ddb2e9e03a35/go.mod h1:cJAu1qRppfZyhIjkRmai6FimO5ulCPBuCtgFKh8v0rg=
github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo=
github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
Expand Down Expand Up @@ -122,8 +124,8 @@ github.com/openstack-k8s-operators/lib-common/modules/ansible v0.4.1-0.202409101
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.4.1-0.20240910122823-bdcfe881513b/go.mod h1:tP+nxk95PisCKJaXE/an2igG9lluxuOVhdmV9WtkR2s=
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20240910122823-bdcfe881513b h1:AUbQgVDLYjZ2YGiKf6G7XFVl86rjJ6sgRHKP9359EDo=
github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.4.1-0.20240910122823-bdcfe881513b/go.mod h1:FagmfcgoZxfJm5YSsJE1riQ0qtPVkD3PFpeC9t3DIF8=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240910122823-bdcfe881513b h1:tf8jULJWDGSpnZRcsHXHtijrIgo1jIoxkwvcwBfWM+4=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240910122823-bdcfe881513b/go.mod h1:6zxa5xg9uvpObVKFSJa/SA+vDDlgh0Q1aswxDB2XbxU=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240926101719-8fc1c3da53f7 h1:tMUnieWnvtEU/7gISSfckkkCmWmVqytVykEfye1PbU8=
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240926101719-8fc1c3da53f7/go.mod h1:3JoOAuMiQYhNcXUipvOhx9mmGnQ3owRwORoxqjFFmS8=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240910122823-bdcfe881513b h1:VZgpwJK6JO0wJaRRozELe6JulQsA5SxZFX+OyLqA6lI=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.4.1-0.20240910122823-bdcfe881513b/go.mod h1:GezFEV/4gMFkwL+tnM0OzYBRqzKJghPJL+gKcNVAj/Y=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240910122823-bdcfe881513b h1:bnJhwLTGLahNdNlUTOAwiZeU+Ojr81Xi8+Zp7iD1hCg=
Expand All @@ -142,8 +144,6 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20240911194922-
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20240911194922-6722dfd65a36/go.mod h1:tGgavimnAXiBEw1TKHbW3jOVnGD84AI4aVQi7+NQ3sw=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20240906043908-171788786286 h1:Z8fIh06z1oWnJAuPkzPHjDZQGVOJHeuaXAyrlM7RHUc=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20240906043908-171788786286/go.mod h1:BOjHTeLCZK7A0iAME27ZDML6qkkOuK2iG3Gtib78Z6Q=
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20240910131347-9bdb826b7218 h1:gAwaRuLWnAm3sBVJe6FFT99N4yPI0aGAOlR6X3edkqg=
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20240910131347-9bdb826b7218/go.mod h1:kLsFkxOqdluhm3wXPBOipHUlkVWjB0HA7PBresPJoJI=
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240907100906-dcfb8a7d068c h1:vupBy7O6m+1wUI2+lB5lSn767DygBFRK3gnw5vS4+KY=
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240907100906-dcfb8a7d068c/go.mod h1:GWpwtDMtWB3+kZ69zsSAk/bC8wGGlY7Txs8HheEC+9w=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 h1:xlj///B7XOfz5RoJvvUnY/MA+mNWhDph9xwSY3bERx8=
Expand Down
7 changes: 3 additions & 4 deletions pkg/openstack/ovn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,11 @@ func ReconcileOVNDbClusters(ctx context.Context, instance *corev1beta1.OpenStack
return false, err
}
}
if instance.Spec.TLS.PodLevel.Enabled {
dbcluster.TLS = OVNDBCluster.Spec.TLS
}

dbcluster.TLS = OVNDBCluster.Spec.TLS
dbcluster.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName

if instance.Spec.TLS.PodLevel.Enabled {
if true {
// create certificate for ovndbclusters
certRequest := certmanager.CertificateRequest{
IssuerName: instance.GetOvnIssuer(),
Expand Down
1 change: 0 additions & 1 deletion tests/functional/ctlplane/openstackoperator_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,6 @@ var _ = Describe("OpenStackOperator controller", func() {
When("A OVN OpenStackControlplane instance is created", func() {
BeforeEach(func() {
spec := GetDefaultOpenStackControlPlaneSpec()
spec["tls"] = GetTLSPublicSpec()
spec["ovn"] = map[string]interface{}{
"enabled": true,
"template": map[string]interface{}{
Expand Down

0 comments on commit 36aff5a

Please sign in to comment.