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) #505

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Update openstack-k8s-operators (main) #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
321a5ca
Update openstack-k8s-operators
Oct 6, 2023
9d603a1
update route.NewRoute to use list of overrides
stuggi Oct 5, 2023
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
6 changes: 6 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 @@ -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
32 changes: 16 additions & 16 deletions apis/go.mod
View file
Open in desktop
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/heat-operator/api v0.1.1-0.20231003012810-582e8b5c58b1
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231006072009-3168275b8294
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231005171754-5229d4814ea8
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231005213555-de19b866026d
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/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/ironic-operator/api v0.3.1-0.20231006045519-4d73854cb09a
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231005132119-e75019792469
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231006072650-7fe7fe16bcd1
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231006072008-252ecd8282fd
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231005123831-d6230489c98e
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231006045746-07ad73abfcba
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231006045745-018e5ccbd82d
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231005121428-58b0e24477c0
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231005123239-669a438b1999
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.20231005115253-5eccb3cf30f5
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.20231006072650-7fe7fe16bcd1 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231006072650-7fe7fe16bcd1
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
64 changes: 32 additions & 32 deletions apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,44 +128,44 @@ 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/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/cinder-operator/api v0.3.1-0.20231006072009-3168275b8294 h1:9yAF0tPJY6IXOKN7fKk3Li+UJegnnon8KqswsOLe2dE=
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231006072009-3168275b8294/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231005171754-5229d4814ea8 h1:Hc1P/DDXnWLknEZV0msYh7xiEU39v6L5GQSdvXIZXV0=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231005171754-5229d4814ea8/go.mod h1:mh+FUgabmIzH9IdX6J+OdkPAxv61d59C9HISe8TRSmE=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231005213555-de19b866026d h1:mkI+cbfg4zrHxGX9UzVz4EjSmjjFQnAlwcqRAPtYdkg=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231005213555-de19b866026d/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=
github.com/openstack-k8s-operators/horizon-operator/api v0.1.1-0.20231003030856-ea1986da02c2/go.mod h1:rfXjTdUGm5Jg9BCEaDkLdZtpC05jbnfA5unMc0qU1cg=
github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20231001103054-f74a88ed4971 h1:5kNS+gseixkgRhYPukQVJyewPTM0lfUOmKP0A03wFFY=
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/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=
github.com/openstack-k8s-operators/ovn-operator/api v0.1.1-0.20231002151504-7dd41df22fa2/go.mod h1:TQ8Bcblkm29ds6oixepkyFuRal+7g6Rcl/xB7ObL5RM=
github.com/openstack-k8s-operators/placement-operator/api v0.1.1-0.20231002182435-64736bf42d4e h1:QpEjzrxSwh7zttOf9co2WEJ2baAbVONzVvN2M3YsbEM=
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/ironic-operator/api v0.3.1-0.20231006045519-4d73854cb09a h1:22mc3Inf0bn4RYy6lnx4rT/wb21KVF8O6bFwyf+sTU8=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231006045519-4d73854cb09a/go.mod h1:NR5xmmZQz/v1EgGfSrL/4yCbQpRbaWLoIx1CgpGiWck=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231005132119-e75019792469 h1:gi9kvJAF8YrsQnRhOVjTWtcjhOqFe7rD3uU6g6pKCFQ=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231005132119-e75019792469/go.mod h1:5v0ngxNmFp8QsINo2bufx1/COJc0q6jm3FMhP3xIAWE=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231006072650-7fe7fe16bcd1 h1:ALZWU2GFDSoOKoBsGbsdgAzlJzGFFsBVFyLvrJIZ+ss=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231006072650-7fe7fe16bcd1/go.mod h1:Ozg6SxfwOtMkiH553c0XQBWuygZQq4jDQCpR4hZqlxM=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231006072650-7fe7fe16bcd1 h1:C1UGjKkwP1d/GwAjoIlgA6h/8FcIAT5De7ShPGSTXEw=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231006072650-7fe7fe16bcd1/go.mod h1:LOXXvTQCwhOBNd+0FTlgllpa3wqlkI6Vf3Q5QVRVPlw=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231006072650-7fe7fe16bcd1 h1:+vRt690N+He4uJM0Cvk7Fguw0zs395A8qfV5Uq8B7kw=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231006072650-7fe7fe16bcd1/go.mod h1:qkK/2JzIGOzoctfe0sbL+mSelrEmErAND4vuj1qTU/A=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231006072008-252ecd8282fd h1:Boq6nfKtxocwOnW2HqOMBVfz4NrhSbNE+HPdSv4nEq8=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231006072008-252ecd8282fd/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.20231005123831-d6230489c98e h1:XUvkJEJHpfRrhLbw7HiBemg9m6GIMMfYUixYjYcnqSg=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231005123831-d6230489c98e/go.mod h1:UV+KJ1V/b+FQr5Nq1Ga3BDxJcfAT6nyirrCRnzcY+ME=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231006045746-07ad73abfcba h1:GRfwR/WoWL15aP2+dszg+uVMHGYY/OSnYztcebqd3mc=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231006045746-07ad73abfcba/go.mod h1:EkSJduf5tao7BPwoCtsmSllvvBcAVwlTiCL+GvT8N/g=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231006045745-018e5ccbd82d h1:JZv/3JeiXQvtRzECqmD+p0urdvz8/y/bSPwKdbLK9Js=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231006045745-018e5ccbd82d/go.mod h1:wDwOTgy8S/FOMC1O1YS6OK/TXP3WyhSIbMiq44XF+10=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231005121428-58b0e24477c0 h1:BOvgqkPaGeXeYxC8xRgU8qqfWQagD9NWmVIkX7IceJI=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231005121428-58b0e24477c0/go.mod h1:hLgc5WItywTzBSbd9/kZto4R2K5VnaW+OH1nKQtZ4vk=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231005123239-669a438b1999 h1:ngZDtnhVgysbkE/17FsdZ1LxGzQyhPKqQPWNK5D1Tn4=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231005123239-669a438b1999/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.20231005115253-5eccb3cf30f5 h1:rkUXXHZaYlnophF0oLawp/5F1AeB8bxckC+9bu1V9qM=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231005115253-5eccb3cf30f5/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
6 changes: 6 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 @@ -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
Loading
Loading