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 Oct 5, 2023
1 parent dcb3454 commit 73f4984
Show file tree
Hide file tree
Showing 6 changed files with 87 additions and 75 deletions.
6 changes: 6 additions & 0 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ spec:
default:
service: CeilometerPassword
properties:
aodhService:
default: AodhPassword
type: string
database:
default: AodhDatabasePassword
type: string
service:
default: CeilometerPassword
type: string
Expand Down
22 changes: 11 additions & 11 deletions apis/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ go 1.19
require (
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.28.0
github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20231002191103-f8b2836ff708
github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20231002123154-8edd775ac551
github.com/openstack-k8s-operators/cinder-operator/api v0.3.0
github.com/openstack-k8s-operators/glance-operator/api v0.3.0
github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20231003012810-582e8b5c58b1
github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20231003030856-ea1986da02c2
github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20231001103054-f74a88ed4971
github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20231002165833-fbbd260fc4cf
github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20231002064359-5fc1bb3e3299
github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20231002090319-8c85a5806ffb
github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20231002132501-83fc02d0bb5c
github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928152002-65395552e015
github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20231003055522-7458d6e1df2e
github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20231002181713-683391def55f
github.com/openstack-k8s-operators/keystone-operator/api v0.3.0
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231005083941-a921a2dab3d8
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231004134924-e000eb86b50b
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231005071941-6f722ce7e0a3
github.com/openstack-k8s-operators/nova-operator/api v0.3.0
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20231002085549-46079733b2af
github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20231002151504-7dd41df22fa2
github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20231002182435-64736bf42d4e
github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230928061421-52a9feee12c9
github.com/openstack-k8s-operators/telemetry-operator/api v0.1.1-0.20230927140521-cf7134b9d873
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231004131915-7144cbee31e7
github.com/rabbitmq/cluster-operator/v2 v2.5.0
k8s.io/apimachinery v0.27.4
sigs.k8s.io/controller-runtime v0.15.1
Expand Down Expand Up @@ -65,8 +65,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.1.1-0.20231002090319-8c85a5806ffb //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20231002090319-8c85a5806ffb
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231005083941-a921a2dab3d8 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231005083941-a921a2dab3d8
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
Expand Down
44 changes: 22 additions & 22 deletions apis/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
github.com/onsi/gomega v1.28.0/go.mod h1:A1H2JE76sI14WIP57LMKj7FVfCHx3g3BcZVjJG8bjX8=
github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI=
github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4=
github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20231002191103-f8b2836ff708 h1:RQ9fzs+1c+1aycqUDhUYLrnkgpTBlmOrKmVFNhiozO0=
github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20231002191103-f8b2836ff708/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk=
github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20231002123154-8edd775ac551 h1:Gwsl557GrLXJWZ9+V/ADOZdl6nUa9/FWqA6ODO+VLM4=
github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20231002123154-8edd775ac551/go.mod h1:mh+FUgabmIzH9IdX6J+OdkPAxv61d59C9HISe8TRSmE=
github.com/openstack-k8s-operators/cinder-operator/api v0.3.0 h1:RqTFtbkCc3a9gXSqfPC12XAowaaQLao89+GHuQl84jM=
github.com/openstack-k8s-operators/cinder-operator/api v0.3.0/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk=
github.com/openstack-k8s-operators/glance-operator/api v0.3.0 h1:lXJnpmxlg4XOatOEOATLk5tm92Qophv2b9gMTZZZmKE=
github.com/openstack-k8s-operators/glance-operator/api v0.3.0/go.mod h1:mh+FUgabmIzH9IdX6J+OdkPAxv61d59C9HISe8TRSmE=
github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20231003012810-582e8b5c58b1 h1:tRCjbvvmxaaDGvtyw+3FfBjzKqB6eAd6BJl3SnhcfJs=
github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20231003012810-582e8b5c58b1/go.mod h1:mByfgTY+QRxpU/EUVic8krhKD/A4RH5psVDJ37bsr74=
github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20231003030856-ea1986da02c2 h1:oNAeZ8s4spnT+opKwCixP0JtE6kUbrGo7st662oi2+4=
Expand All @@ -140,22 +140,22 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20231001103054-f
github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20231001103054-f74a88ed4971/go.mod h1:zqFs5MrBKeaE4HQroUgMWwIkBwmmcygg6sghcidSdCA=
github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20231002165833-fbbd260fc4cf h1:eaMs4buiGtF50sDCZYZgDcM9BMX3NItEypz9su+t6BQ=
github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20231002165833-fbbd260fc4cf/go.mod h1:NR5xmmZQz/v1EgGfSrL/4yCbQpRbaWLoIx1CgpGiWck=
github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20231002064359-5fc1bb3e3299 h1:iRgKQiCwSmujWIz8o8vTD7V+whMptcv8LPfGD5Da/9Y=
github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20231002064359-5fc1bb3e3299/go.mod h1:5v0ngxNmFp8QsINo2bufx1/COJc0q6jm3FMhP3xIAWE=
github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20231002090319-8c85a5806ffb h1:jgbzzrCprRSJJO9K0GbfX1DuFQysVygLKFDkk0liqcM=
github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20231002090319-8c85a5806ffb/go.mod h1:Ozg6SxfwOtMkiH553c0XQBWuygZQq4jDQCpR4hZqlxM=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20231002090319-8c85a5806ffb h1:AfMP5iucttYsiY1Jwo6PlrgmJ14dDyZ/qAukkZ7NBSk=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20231002090319-8c85a5806ffb/go.mod h1:LOXXvTQCwhOBNd+0FTlgllpa3wqlkI6Vf3Q5QVRVPlw=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20231002090319-8c85a5806ffb h1:Wpq8CssgUVhmQrreNXpxOfi1Em36344jaEaTV8aVk6I=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20231002090319-8c85a5806ffb/go.mod h1:qkK/2JzIGOzoctfe0sbL+mSelrEmErAND4vuj1qTU/A=
github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20231002132501-83fc02d0bb5c h1:/gI3W8XZCzXCMb8fAT6Q8eCILHCxtrc8TqJW24N7LAo=
github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20231002132501-83fc02d0bb5c/go.mod h1:rJkTThV08Be6hnxw7IbDSrIPQ/FqQ2Uzhe9NdppoP4E=
github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928152002-65395552e015 h1:1G37nuB9C8QPp7tScEpwbR7eQj+2e6l089MNzj5cChk=
github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928152002-65395552e015/go.mod h1:xhiz5wFdKWwVM7BF/VYon4TT3NuUPXp/Pyn2hWcp0CE=
github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20231003055522-7458d6e1df2e h1:GqYPeyeqW5DUyKuVSFdDPKNj3HA0iIvsL4Ij7QuijZw=
github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20231003055522-7458d6e1df2e/go.mod h1:UV+KJ1V/b+FQr5Nq1Ga3BDxJcfAT6nyirrCRnzcY+ME=
github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20231002181713-683391def55f h1:OnNMvFvhLWEf+EZ4xsUSvrO8pET8dF2CFUgaS1nFjw4=
github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20231002181713-683391def55f/go.mod h1:EkSJduf5tao7BPwoCtsmSllvvBcAVwlTiCL+GvT8N/g=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.0 h1:CmqfZaaylSR71dG682Docv+cXpyWylXompt4/lPtFeY=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.0/go.mod h1:5v0ngxNmFp8QsINo2bufx1/COJc0q6jm3FMhP3xIAWE=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231005083941-a921a2dab3d8 h1:Pu8lXwNM3Qu3kEtewvxjXT3xCnRu+CWa0cPz2ljshLM=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231005083941-a921a2dab3d8/go.mod h1:Ozg6SxfwOtMkiH553c0XQBWuygZQq4jDQCpR4hZqlxM=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231005083941-a921a2dab3d8 h1:Xrz+myKF5BvCxb7jUJdirMcjiyZ+aMeZNnrmVfmjmY4=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231005083941-a921a2dab3d8/go.mod h1:LOXXvTQCwhOBNd+0FTlgllpa3wqlkI6Vf3Q5QVRVPlw=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231005083941-a921a2dab3d8 h1:Q+rV6Z7blzU19YXSN5152a9++bNNFy24ULuueNz2Azc=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231005083941-a921a2dab3d8/go.mod h1:qkK/2JzIGOzoctfe0sbL+mSelrEmErAND4vuj1qTU/A=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231004134924-e000eb86b50b h1:8b4VishWU86xPWEu+74VYT7o5P542m/tsqMLjPYJ13g=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231004134924-e000eb86b50b/go.mod h1:rJkTThV08Be6hnxw7IbDSrIPQ/FqQ2Uzhe9NdppoP4E=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0 h1:FB0xB6whYM6W4XIncYo2mPiOJWkFsIOWtCT+UOtvOaQ=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0/go.mod h1:xhiz5wFdKWwVM7BF/VYon4TT3NuUPXp/Pyn2hWcp0CE=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231005071941-6f722ce7e0a3 h1:dBdMGo2a3StGjtUPebXmJNd7KaDBvEGTVMQE/qSaieg=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231005071941-6f722ce7e0a3/go.mod h1:UV+KJ1V/b+FQr5Nq1Ga3BDxJcfAT6nyirrCRnzcY+ME=
github.com/openstack-k8s-operators/nova-operator/api v0.3.0 h1:kKT5EpFZAmYrS9g1SfbYOaZXIxpfbZRty/bvhk4VrJA=
github.com/openstack-k8s-operators/nova-operator/api v0.3.0/go.mod h1:EkSJduf5tao7BPwoCtsmSllvvBcAVwlTiCL+GvT8N/g=
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20231002085549-46079733b2af h1:FNE5b+Mg6LC4WSMpQQtorTkL2yYGS7OCtDLCSdYIWwo=
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20231002085549-46079733b2af/go.mod h1:wDwOTgy8S/FOMC1O1YS6OK/TXP3WyhSIbMiq44XF+10=
github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20231002151504-7dd41df22fa2 h1:gCpSSkfI09aVEbOSElk8yFy8TdyAFWNKIM4WLoq+puQ=
Expand All @@ -164,8 +164,8 @@ github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.2023100218243
github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20231002182435-64736bf42d4e/go.mod h1:iyp/X2jUYQmIGovZNdvUooA8km+/KnzGOOHIcIWPa4U=
github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230928061421-52a9feee12c9 h1:0eFyMbHhT9qCoW6B/Mc28Ser69pSmPJkkk5mLA8xp2w=
github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230928061421-52a9feee12c9/go.mod h1:cmDpu3koEFV+ssOeEDMjAAW18BvwwmbWXSw0eRIo8yg=
github.com/openstack-k8s-operators/telemetry-operator/api v0.1.1-0.20230927140521-cf7134b9d873 h1:Zi/bA2r/cDJ7yVtVcv00GfzR/d2B+jaxNngAHXCKHrQ=
github.com/openstack-k8s-operators/telemetry-operator/api v0.1.1-0.20230927140521-cf7134b9d873/go.mod h1:Fe1o6yI1CmT2KO96rySgoG5JgpQXkZ5dRkScHWFuuZ8=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231004131915-7144cbee31e7 h1:/flSMGHsvvfWRIBSvdi65YIbxRXdIBmeZcNKN+9taHg=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231004131915-7144cbee31e7/go.mod h1:bGZyr0RZ2T2R2wO7akiVc1FzA6cVhPr0zMznPhzlmzY=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ spec:
default:
service: CeilometerPassword
properties:
aodhService:
default: AodhPassword
type: string
database:
default: AodhDatabasePassword
type: string
service:
default: CeilometerPassword
type: string
Expand Down
28 changes: 14 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ require (
github.com/imdario/mergo v0.3.16
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.28.0
github.com/openstack-k8s-operators/cinder-operator/api v0.1.2-0.20231002191103-f8b2836ff708
github.com/openstack-k8s-operators/dataplane-operator/api v0.1.1-0.20231003013838-dc213bef8f34
github.com/openstack-k8s-operators/glance-operator/api v0.1.2-0.20231002123154-8edd775ac551
github.com/openstack-k8s-operators/cinder-operator/api v0.3.0
github.com/openstack-k8s-operators/dataplane-operator/api v0.3.0
github.com/openstack-k8s-operators/glance-operator/api v0.3.0
github.com/openstack-k8s-operators/heat-operator/api v0.1.1-0.20231003012810-582e8b5c58b1
github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20231003030856-ea1986da02c2
github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20231001103054-f74a88ed4971
github.com/openstack-k8s-operators/ironic-operator/api v0.1.1-0.20231002165833-fbbd260fc4cf
github.com/openstack-k8s-operators/keystone-operator/api v0.1.1-0.20231002064359-5fc1bb3e3299
github.com/openstack-k8s-operators/lib-common/modules/common v0.1.1-0.20231002090319-8c85a5806ffb
github.com/openstack-k8s-operators/manila-operator/api v0.1.1-0.20231002132501-83fc02d0bb5c
github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230928152002-65395552e015
github.com/openstack-k8s-operators/neutron-operator/api v0.1.1-0.20231003055522-7458d6e1df2e
github.com/openstack-k8s-operators/nova-operator/api v0.1.2-0.20231002181713-683391def55f
github.com/openstack-k8s-operators/keystone-operator/api v0.3.0
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231005083941-a921a2dab3d8
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231004134924-e000eb86b50b
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231005071941-6f722ce7e0a3
github.com/openstack-k8s-operators/nova-operator/api v0.3.0
github.com/openstack-k8s-operators/octavia-operator/api v0.0.0-20231002085549-46079733b2af
github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.1.1-0.20231003081734-69e3578ef538
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.1.1-0.20231001140728-637dbae67552
github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.3.0
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.3.0
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20230725141229-4ce90d0120fd
github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20231002151504-7dd41df22fa2
github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20231002182435-64736bf42d4e
github.com/openstack-k8s-operators/swift-operator/api v0.1.1-0.20230928061421-52a9feee12c9
github.com/openstack-k8s-operators/telemetry-operator/api v0.1.1-0.20230927140521-cf7134b9d873
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231004131915-7144cbee31e7
github.com/operator-framework/api v0.17.6
github.com/rabbitmq/cluster-operator/v2 v2.5.0
go.uber.org/zap v1.26.0
Expand Down Expand Up @@ -75,8 +75,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
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20231002090319-8c85a5806ffb //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.1.1-0.20231002090319-8c85a5806ffb //indirect
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231005083941-a921a2dab3d8 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231005083941-a921a2dab3d8 //indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
Expand Down
Loading

0 comments on commit 73f4984

Please sign in to comment.