Skip to content

Commit

Permalink
Update openstack-k8s-operators
Browse files Browse the repository at this point in the history
  • Loading branch information
OpenStack K8s CI committed Mar 5, 2024
1 parent 28cd696 commit 62637f3
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 110 deletions.
10 changes: 3 additions & 7 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10904,11 +10904,11 @@ spec:
type: string
customServiceConfig:
type: string
databaseInstance:
type: string
databaseUser:
databaseAccount:
default: placement
type: string
databaseInstance:
type: string
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down Expand Up @@ -10974,12 +10974,8 @@ spec:
type: object
passwordSelectors:
default:
database: PlacementDatabasePassword
service: PlacementPassword
properties:
database:
default: PlacementDatabasePassword
type: string
service:
default: PlacementPassword
type: string
Expand Down
28 changes: 14 additions & 14 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ require (
github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240226165142-cb4e05f187dc
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240301180431-f14a9a6de626
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240227172900-6b5267549089
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240228075535-ca3432cb65c2
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240229065949-dc7919e45441
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240227193241-8c506107e152
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240221083751-49edc0df8a12
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240304152949-edd530c00b27
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240304134506-75f0ae5a1d43
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240304123904-038a5ec77a70
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240226160457-b1b853eb4600
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240229121803-169ced56d56e
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240228192101-00bb019bd68b
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240222094307-76fef735f093
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240304121914-b5c254fb0fe4
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240304134520-78462188f035
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240302094741-8fd5fb0f0017
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240303091826-438dde8600d3
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240301125628-fe5c58abe3d0
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240229155106-17a899255ec6
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240229160800-aa54e85bdfb3
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240227150317-d42793e452c2
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240229134606-d2a5a5abde9d
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240304170849-9270551e423b
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240304151848-52d0be4498af
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240304184006-7d21e7ffafb9
github.com/rabbitmq/cluster-operator/v2 v2.5.0
k8s.io/apimachinery v0.29.0
sigs.k8s.io/controller-runtime v0.16.5
Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gophercloud/gophercloud v1.9.0 // indirect
github.com/gophercloud/gophercloud v1.10.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -72,8 +72,8 @@ 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.20240229121803-169ced56d56e //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240229121803-169ced56d56e
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240304134520-78462188f035 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240304134520-78462188f035
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
Expand Down
56 changes: 28 additions & 28 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 h1:2XF1Vzq06X+inNqgJ9
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gophercloud/gophercloud v1.9.0 h1:zKvmHOmHuaZlnx9d2DJpEgbMxrGt/+CJ/bKOKQh9Xzo=
github.com/gophercloud/gophercloud v1.9.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
github.com/gophercloud/gophercloud v1.10.0 h1:watRMsaMDlSLuLkpLeLSQ87yvcuwIajNg6A5uLcjoIU=
github.com/gophercloud/gophercloud v1.10.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
Expand Down Expand Up @@ -80,28 +80,28 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240301180431-f
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240301180431-f14a9a6de626/go.mod h1:dDJq0k9DUUb4qm9aucmqX51lS+0LajVzTXqg9Ly002E=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240227172900-6b5267549089 h1:n5ytlzAf5XRhGjmJ80ojiNzJZT4izRoiTM3iEle/C1k=
github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240227172900-6b5267549089/go.mod h1:1oHx1drl2TNl4dV4VieGR8eGd7XsbY6K+FGa3tyuURI=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240228075535-ca3432cb65c2 h1:KTi3yNIDZlvBh2waaFXx21Dbs96QGB0JVbcBd7Yo8sM=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240228075535-ca3432cb65c2/go.mod h1:gyP7080DJ0stnnqqPT88ED0TCBtDxveSQ948PbqNNd8=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240229065949-dc7919e45441 h1:RPew5Yp78IHjBujUFkcm76T3qHKHV8lnsI/PZdbsFek=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240229065949-dc7919e45441/go.mod h1:Trb7pKg10PcbXs7LbX3b+tnPtuPixe9Y4/RlP7pU+kg=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240227193241-8c506107e152 h1:dh5h1jEaYGXThCKAtirR/GSTum9CDhTUQyckv1cxJDM=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240227193241-8c506107e152/go.mod h1:Hzq/OQJ/CC2HeohMw7jh3eqQpIf3FEC2kQSw48bWV+s=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240221083751-49edc0df8a12 h1:n+A0L+6w3Yt9iOVWdu0aU8Ig0fICv4luruVjH5kU7KM=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240221083751-49edc0df8a12/go.mod h1:2//rIZ8ucDbK+gLxvwmU6uPCm6o/C6GxXJHDo4ye7I8=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240304152949-edd530c00b27 h1:+B5AjiLc7l1VMoXmLciHCvvh9m+qgMqJNy5xpVxbMjQ=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240304152949-edd530c00b27/go.mod h1:tsD3aiAwK5JyrrpP8wGCO2Sa3F78W9Ov9cHdCsPkzRs=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240304134506-75f0ae5a1d43 h1:2Kl9sWPpMk30mcHMKPHl1nTYxZTwDkVfXOx9QiSNNqI=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240304134506-75f0ae5a1d43/go.mod h1:63UcRnUoHAyeXwUJa/6tmphZf4ScoY2+s7ItDV+m3BQ=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996 h1:+wkmeYGCYfbA+hoAIdShomyptqoqyJ33VYUxUaJoAVA=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240304130922-946bc7dd0996/go.mod h1:Hzq/OQJ/CC2HeohMw7jh3eqQpIf3FEC2kQSw48bWV+s=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240304123904-038a5ec77a70 h1:aLQuVEQKwV2nM4n232/7TnA50t5DD05deEvKyl6Gd5Y=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240304123904-038a5ec77a70/go.mod h1:yPqJ+WU8jApuDXNUjpTxMafihuZpX3Yik9ZXqGaxYBQ=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91 h1:3yvrS33IOQibrXJJlVs/fDxLi5RCZlN5oDrR2c8aShk=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240229174131-28e3aee56d91/go.mod h1:Yac7wRClzl1/a7uBso4w8wq6Rjm+JLIouEsLre7VSDE=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240226160457-b1b853eb4600 h1:Lqlkv5CWGlarcjsc1SW2YzhxAVQtQZp0BWEwFUl+OyM=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240226160457-b1b853eb4600/go.mod h1:YyoDWNxCFstwhVRAcEh2X6bXBG0ML5iEhOYQhltgqi4=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240229121803-169ced56d56e h1:zpxxz/iI8C09XHBcDYW9prMoODndBBsSmoonRXRXu1Q=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240229121803-169ced56d56e/go.mod h1:P2a38htIPn9Ws9eqZBS/5jfxzLdMdBqZcbv6H4YcQfw=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240229121803-169ced56d56e h1:T/ZQR6KfJf45ydZq4gsq7FUl+bKR1IIQpuvja9Nun4s=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240229121803-169ced56d56e/go.mod h1:fvCDr4wd7Oy2rIunTzpGoMKWXHk2pQYaF3tJBFLELpM=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240229121803-169ced56d56e h1:801PPU2Awfnqg/uJMeGOfi3zkNA0qS5axmINN6Gusbg=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240229121803-169ced56d56e/go.mod h1:hKoDyLpp/Hc6fE1rYhlgXw8pYUPyRDKLgBrkAda5IPA=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240228192101-00bb019bd68b h1:pR1cMOIKQu2OXmbMWXY/0O+4HVIY3j35oM6tPvtzE7E=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240228192101-00bb019bd68b/go.mod h1:+3btR/1Jr/Zjc0L7lfGQmtRO8Mv0iMzvBFlUfs0KHhk=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240222094307-76fef735f093 h1:gmm2o5bVYIeuAVHp7WsDIpQc8vh+/9tUUYY4Wfyus/o=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240222094307-76fef735f093/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240304121914-b5c254fb0fe4 h1:s7bqP76N9Pv3lGsvaOyAxQ1OZCU4NhF7lUXWtMkq2Z4=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240304121914-b5c254fb0fe4/go.mod h1:YyoDWNxCFstwhVRAcEh2X6bXBG0ML5iEhOYQhltgqi4=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240304134520-78462188f035 h1:vGFtEGsiKOqVFO0oJtAvnnKDCKdiPoHYnp1/zQyEhEY=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240304134520-78462188f035/go.mod h1:P2a38htIPn9Ws9eqZBS/5jfxzLdMdBqZcbv6H4YcQfw=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240304134520-78462188f035 h1:w37ek5OtePLEUr82udGfNy6b1pcknkEL+FDEQ84wlDU=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240304134520-78462188f035/go.mod h1:fvCDr4wd7Oy2rIunTzpGoMKWXHk2pQYaF3tJBFLELpM=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240304134520-78462188f035 h1:7NzkziKhdS6r0G21XF+Ogu3Rxea7R9umuJcFRqwmz0Y=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240304134520-78462188f035/go.mod h1:hKoDyLpp/Hc6fE1rYhlgXw8pYUPyRDKLgBrkAda5IPA=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240302094741-8fd5fb0f0017 h1:qixLVCJfDIyr5YYeNlvh4G801fWkhLZLh4BLCVIO1Vs=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240302094741-8fd5fb0f0017/go.mod h1:WjZonBUlokd/WM3bzlGqW0KncogYyxUDmWmKvxSPlLE=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240303091826-438dde8600d3 h1:fwb+GvvnN9Mhkgg5pBksZ8W5+hLCcNOorHsUTQYA1Lg=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240303091826-438dde8600d3/go.mod h1:f9IIyWeoskWoeWaDFF3qmAJ2Kqyovfi0Ar/QUfk3qag=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240301125628-fe5c58abe3d0 h1:zNx1sXrgvlwGOxnQjX/UM3NO6arzaBunwU1HGCF24k0=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240301125628-fe5c58abe3d0/go.mod h1:CksD/5C9axzus0zjX5Q+MIiDhdijYbO2NzDYdrQqN2I=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240229155106-17a899255ec6 h1:fYNrX1vEB2DehKnHFDPAK96W0jSKZvZXZcJZTjZKLcg=
Expand All @@ -110,12 +110,12 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240229160800-
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240229160800-aa54e85bdfb3/go.mod h1:KXCbHFGtVwtnFIq8ZnpRA/gFSByXhANUpIJK8c9dqfs=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240227150317-d42793e452c2 h1:a9aB73R9ZBXlee1kazLIZ9r1LtnuqMbPHJ/0wAgXtn8=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240227150317-d42793e452c2/go.mod h1:1u75r7K/3O7c7WDEn4ItZiZPu8smETxLdRhpi6yt+7I=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240229134606-d2a5a5abde9d h1:4z5AZlNTmA5Vud/LXBuXA+p9FyDD9xtTyjl5J5vMrpo=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240229134606-d2a5a5abde9d/go.mod h1:ePH8U08vCJQ4dwTuh/nLiidqlNOPx/EuRWjIbSEW1hY=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79 h1:OPqHOID5/2sr4hZtvWdm03xje1GeCf/u6FiRViZXFwU=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79/go.mod h1:NW/gfy7soUXzx7H/JsOcqQ7GhBJ2DvrjEy4ZKr5uR8s=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5 h1:j8Kj8+xQC2FQRkdVUwOgFAZlhFtMV1YygVCypxLmllw=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5/go.mod h1:Css7ZpU59JmTX/GegION98Y6XFKceBx/zxQQHptwd+8=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240304170849-9270551e423b h1:eWX9XbpCxWaNFX/ClFn/+P84qe4fRoN+3Fq7jDKVCs0=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240304170849-9270551e423b/go.mod h1:ePH8U08vCJQ4dwTuh/nLiidqlNOPx/EuRWjIbSEW1hY=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240304151848-52d0be4498af h1:IL7ou1B+73p8b8xol0W89+dnh2DQGxMT2gn0lEi+Wh8=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240304151848-52d0be4498af/go.mod h1:NW/gfy7soUXzx7H/JsOcqQ7GhBJ2DvrjEy4ZKr5uR8s=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240304184006-7d21e7ffafb9 h1:PB7AgYumdrd0EhdfHyqSSADzcav5Th98yjQ96CQ8Ks8=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240304184006-7d21e7ffafb9/go.mod h1:Css7ZpU59JmTX/GegION98Y6XFKceBx/zxQQHptwd+8=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down
10 changes: 3 additions & 7 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10904,11 +10904,11 @@ spec:
type: string
customServiceConfig:
type: string
databaseInstance:
type: string
databaseUser:
databaseAccount:
default: placement
type: string
databaseInstance:
type: string
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down Expand Up @@ -10974,12 +10974,8 @@ spec:
type: object
passwordSelectors:
default:
database: PlacementDatabasePassword
service: PlacementPassword
properties:
database:
default: PlacementDatabasePassword
type: string
service:
default: PlacementPassword
type: string
Expand Down
Loading

0 comments on commit 62637f3

Please sign in to comment.