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 19, 2023
1 parent 78b3c87 commit 9cbd373
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 95 deletions.
7 changes: 6 additions & 1 deletion apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,7 @@ spec:
- auth-zone
- synth-domain
- no-negcache
- local
type: string
values:
items:
Expand Down Expand Up @@ -7320,6 +7321,9 @@ spec:
- extraVol
type: object
type: array
memcachedInstance:
default: memcached
type: string
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -7442,6 +7446,7 @@ spec:
required:
- containerImage
- databaseInstance
- memcachedInstance
- rabbitMqClusterName
- secret
type: object
Expand Down Expand Up @@ -8161,7 +8166,7 @@ spec:
preserveJobs:
default: false
type: boolean
stopDBSync:
stopJob:
default: false
type: boolean
stopService:
Expand Down
30 changes: 15 additions & 15 deletions apis/go.mod
View file
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.13.0
github.com/onsi/gomega v1.28.0
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231006133827-ce89e0fd01f2
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231018031823-48a662e6dcfe
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231013112543-a07d8273b82d
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231015090350-5fdcca35e29e
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231016213913-eacfd44e505f
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231015112558-692aca16f97d
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231012092711-5f52f15720bf
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231014140921-5dc594250975
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231013095818-732d852436d1
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011150636-e8a0540a3c32
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231012085014-53eb700c783c
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231018060345-8518a89de1be
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231019064410-5c72e6381cbc
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231017110713-7b1a1e54bd46
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231019091705-f3aa3d057b0f
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231017114157-49522e78f991
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231016065720-1590e54becc8
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231016080031-b0f729a493c0
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231019125621-7c2a5a4a5186
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231019131906-d371f09abbc6
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231012052157-e3ff0e9c016d
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231016054924-e5f13f78907f
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231016100822-fb7b80f996df
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231016075239-56484f8630e5
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231013042845-4790660aa000
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231018075509-f7a9b932a731
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231019140607-fa22c55029af
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231018162323-f7d34da73f25
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231019073944-7216df5e5994
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.3.1-0.20231011150636-e8a0540a3c32 //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231011150636-e8a0540a3c32
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231019091705-f3aa3d057b0f //indirect
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231019091705-f3aa3d057b0f
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
60 changes: 30 additions & 30 deletions apis/go.sum
View file
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.3.1-0.20231006133827-ce89e0fd01f2 h1:sPQWPiTBSyNf1vdImemK4vAjavwmf/cKXkIrIMOVWTs=
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231006133827-ce89e0fd01f2/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk=
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231018031823-48a662e6dcfe h1:5lAcgOSjDrh0HrJa2w3l9rOJBaH8iSP6Bth169XI7Nw=
github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20231018031823-48a662e6dcfe/go.mod h1:8NFIyjXZeC+T2UBcmTDTfSatRdhi2eaZlaAuzcT2rNk=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231013112543-a07d8273b82d h1:WEG0KPgsujhwVh7W/IbJ8I8JTDUuJj6V5rWD6L+KzbI=
github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231013112543-a07d8273b82d/go.mod h1:D+c4nLxVzSZDeYqAGrfD5po2+udzVkF5M5SCF9QeMMY=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231015090350-5fdcca35e29e h1:XBXHAOx6UbYT5IKiSX4GcFLrvc6ccdcHi39As7+1NvM=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231015090350-5fdcca35e29e/go.mod h1:w4AkvOs7PCint2ZJSk2/ownZE3qQnVryNuqZsw0ZKM4=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231016213913-eacfd44e505f h1:MhyMr9IHMv4olsjinXziGebJAFSj9EJhXKIp6f+Y8aA=
github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231016213913-eacfd44e505f/go.mod h1:w4AkvOs7PCint2ZJSk2/ownZE3qQnVryNuqZsw0ZKM4=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231015112558-692aca16f97d h1:WID1OPHjN8saP8SK5SZfE9m31e5HYrTltIugrIHgt3w=
github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231015112558-692aca16f97d/go.mod h1:jbOCN8Q6LBSnuEykkQq8/CDg9WSjmjdOqrXPtv4B57c=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231012092711-5f52f15720bf h1:t+nh7H3Kq4U+0a5KFZI6zYKcQXW1x5uWbPkUAeiO78o=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231012092711-5f52f15720bf/go.mod h1:Zx2FewCh3EFd62QGE7WnZBiAg0Spkm+FNM04eSRby1Q=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231014140921-5dc594250975 h1:10PgjR/q2q3NJQMINXZNaiDAlliK2UqjqTMGDfosJ2k=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231014140921-5dc594250975/go.mod h1:QJA4yh2B6lgZzrOOb0iW8JyDmB7uRT/Mokiwalca3Cw=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231013095818-732d852436d1 h1:BIo93Hmk6n8Z8N1cyXCqmRTL3QQQQIoLxXH+xyl4kfs=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231013095818-732d852436d1/go.mod h1:sDYtAWryP7mF2v4XfmKdAoFquVAMts2J5PuYFV9VBQU=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011150636-e8a0540a3c32 h1:r24jE5tdacLivcZczb3t6RvbvHp6kXQrW2ECuekzgH8=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011150636-e8a0540a3c32/go.mod h1:xXAuy7HtWN4p7LF5Q+NHLkwAsKVh0KrzpnuPYIG3XaA=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231011150636-e8a0540a3c32 h1:n9UNbe3JsJW6IYtk57y/gvYSdiV8W6L4N0PtkZ2EsEg=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231011150636-e8a0540a3c32/go.mod h1:26FhBsCrEsczCiV5fOLT2sQp5gbWCUuQZjmUdFyD/oI=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231011150636-e8a0540a3c32 h1:UswqYNyvW/ne9oI9rLwddyT7F/MT+ggL9ElMtO2SRRY=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231011150636-e8a0540a3c32/go.mod h1:baotYmNGQjRCgu/9LxjrFZzTIT2/4yLktJK8h/Fa0Ig=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231012085014-53eb700c783c h1:UHmCERL8Pa5ciVKQ6lbMaeQYP0X1SFC1NlF/PwIeThE=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231012085014-53eb700c783c/go.mod h1:CWhsVSCJsXQ04kG2WpBGj2jtu2tZb7zi4UFi3uKWe8E=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231018060345-8518a89de1be h1:aaMotXCP0KjspNBOL3PNowtCw9HspVQRn07wt6hJ8l0=
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20231018060345-8518a89de1be/go.mod h1:Zx2FewCh3EFd62QGE7WnZBiAg0Spkm+FNM04eSRby1Q=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231019064410-5c72e6381cbc h1:1/BPqj8f7bbZCJDJUXgyMOj6kiWcCn6oStVOdu8dswU=
github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231019064410-5c72e6381cbc/go.mod h1:QJA4yh2B6lgZzrOOb0iW8JyDmB7uRT/Mokiwalca3Cw=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231017110713-7b1a1e54bd46 h1:EgglSFb+05sWY5Z2JivMnXT7XSdGEOqpPfnlsc0oqvE=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20231017110713-7b1a1e54bd46/go.mod h1:sDYtAWryP7mF2v4XfmKdAoFquVAMts2J5PuYFV9VBQU=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231019091705-f3aa3d057b0f h1:GhwRUVLRKKCEkK06uUXTMmT/waLJQPP5kMGpN6ozbc0=
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231019091705-f3aa3d057b0f/go.mod h1:xXAuy7HtWN4p7LF5Q+NHLkwAsKVh0KrzpnuPYIG3XaA=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231019091705-f3aa3d057b0f h1:UItXdH97OtXMhW+gLa/xeCTDlm/9wMy3hiGoOLlY01I=
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231019091705-f3aa3d057b0f/go.mod h1:+J/GuQH7/JJF8SJtWYWxgDsYlqDv+fucxwFNP+QTcKk=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231019091705-f3aa3d057b0f h1:WBoCIlbxWeg+hIaawVvQX/XiuEw80WHEHouw4H+0Ksk=
github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231019091705-f3aa3d057b0f/go.mod h1:baotYmNGQjRCgu/9LxjrFZzTIT2/4yLktJK8h/Fa0Ig=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231017114157-49522e78f991 h1:8bi5MJwe9jea0gtFXpUQpYeQuDo7ULEUpOCwWi8XrXY=
github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231017114157-49522e78f991/go.mod h1:HZ2ZuXYMpLJPqg+rUy/ZlNTCA2FnNp0fkRadCL4z7WA=
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.20231016065720-1590e54becc8 h1:G/dfJ/ennWpFoz2HtVL2OnaLxpZ+nl2aVwx9lqGKwh4=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231016065720-1590e54becc8/go.mod h1:cKr0xZME9DePkWqXbyKFjNprjCeJl5WdE/Xn+lYWY7I=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231016080031-b0f729a493c0 h1:nqhnsff/Z6NBT3O9R4OPu9NNmx99oYiczcHv3OEir00=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231016080031-b0f729a493c0/go.mod h1:5s4XYT+mvBKG68twYm22R1qMX8ZEbp6RPhvBkjqYqUQ=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231019125621-7c2a5a4a5186 h1:pymyGAni8tJ5juel1rTbSx0sUxfjKVwM55eNSK7V5Ls=
github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231019125621-7c2a5a4a5186/go.mod h1:cKr0xZME9DePkWqXbyKFjNprjCeJl5WdE/Xn+lYWY7I=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231019131906-d371f09abbc6 h1:sbosbVd31OagqdtMhYYKI++4PWs4KHDTfebMvegwFw0=
github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231019131906-d371f09abbc6/go.mod h1:5s4XYT+mvBKG68twYm22R1qMX8ZEbp6RPhvBkjqYqUQ=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231012052157-e3ff0e9c016d h1:bbu7Po1kXakDx3tDkiSboF6HiKM0Qpd3OwiMlxKxgkQ=
github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231012052157-e3ff0e9c016d/go.mod h1:dz3GimbnEJBxz9wT2TV9sQxqOn0pohJYPmmEY2+Ivm4=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231016054924-e5f13f78907f h1:qY8tWb1z2D6EexCMafmVKo8bXExwQpHXySnpzsnW+uE=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231016054924-e5f13f78907f/go.mod h1:aZ0o89jgQYYf1BgMrNlDw2VZB15ZCMd5z8YiydjgB0s=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231016100822-fb7b80f996df h1:skF9XWGDBssNdz99tvti0mh5qlE0E9WhPkv+Kwtzpyg=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231016100822-fb7b80f996df/go.mod h1:jkzc4nL8U3+MUP458ZnGkt6Turs9bRw93GdtJ6mD910=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231016075239-56484f8630e5 h1:a/wzY+33egeonk6zBUSacY7PEWcXTXVIBLXhf7PYUSM=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231016075239-56484f8630e5/go.mod h1:/I+gJIWzBGV/rSc+Tn80sgm0pIR2+fvPGS0N/BOWvwY=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231013042845-4790660aa000 h1:wIx7r3/6tN3u63KqEtT+6wy3gDmWM/+JlN4OKKl/UYY=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231013042845-4790660aa000/go.mod h1:fOqe5ElCuyhD+Ul6iXZNWylHC+jYufwIOn6GYhilUag=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231018075509-f7a9b932a731 h1:t7s9Av7nZjiDz/d+Z6/JWZKpF8FHx2g4FZ10mY+WqAs=
github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231018075509-f7a9b932a731/go.mod h1:aZ0o89jgQYYf1BgMrNlDw2VZB15ZCMd5z8YiydjgB0s=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231019140607-fa22c55029af h1:VUyNR2qf6yilehyAkm8srjQEBdvxVwp7l6VCg7krk7w=
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231019140607-fa22c55029af/go.mod h1:jkzc4nL8U3+MUP458ZnGkt6Turs9bRw93GdtJ6mD910=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231018162323-f7d34da73f25 h1:lhNTvF2V1dcSZyI67zp3MLYyUCbWeBWaEuPi/dIwgUo=
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231018162323-f7d34da73f25/go.mod h1:/I+gJIWzBGV/rSc+Tn80sgm0pIR2+fvPGS0N/BOWvwY=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231019073944-7216df5e5994 h1:IlOesz4GKAkqHzWHQRRfNIfn3bC0JyCJtq13n0H9zFs=
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231019073944-7216df5e5994/go.mod h1:fOqe5ElCuyhD+Ul6iXZNWylHC+jYufwIOn6GYhilUag=
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
7 changes: 6 additions & 1 deletion config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,7 @@ spec:
- auth-zone
- synth-domain
- no-negcache
- local
type: string
values:
items:
Expand Down Expand Up @@ -7320,6 +7321,9 @@ spec:
- extraVol
type: object
type: array
memcachedInstance:
default: memcached
type: string
networkAttachments:
items:
type: string
Expand Down Expand Up @@ -7442,6 +7446,7 @@ spec:
required:
- containerImage
- databaseInstance
- memcachedInstance
- rabbitMqClusterName
- secret
type: object
Expand Down Expand Up @@ -8161,7 +8166,7 @@ spec:
preserveJobs:
default: false
type: boolean
stopDBSync:
stopJob:
default: false
type: boolean
stopService:
Expand Down
Loading

0 comments on commit 9cbd373

Please sign in to comment.