Update openstack-k8s-operators

openstack-k8s-operators · Oct 12, 2023 · 25fcead · 25fcead
1 parent 55904f0
commit 25fcead
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 75 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -3373,6 +3373,9 @@ spec:
                         required:
                         - containerImage
                         type: object
+                      imageCacheSize:
+                        default: ""
+                        type: string
                       nodeSelector:
                         additionalProperties:
                           type: string
@@ -3426,6 +3429,7 @@ spec:
                     - databaseInstance
                     - glanceAPIExternal
                     - glanceAPIInternal
+                    - imageCacheSize
                     - secret
                     - storageRequest
                     type: object
@@ -8637,6 +8641,8 @@ spec:
                           serviceUser:
                             default: octavia
                             type: string
+                          transportURLSecret:
+                            type: string
                         required:
                         - containerImage
                         - databaseInstance

diff --git a/apis/go.mod b/apis/go.mod
@@ -3,25 +3,25 @@ module github.com/openstack-k8s-operators/openstack-operator/apis
 go 1.19
 
 require (
-	github.com/onsi/ginkgo/v2 v2.12.1
+	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/glance-operator/api v0.3.1-0.20231009142602-1164674290d8
+	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231010130554-ab1baca2edc1
 	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231009062722-38938dcb2b5b
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231009062721-cda11ea96e2b
 	github.com/openstack-k8s-operators/infra-operator/apis v0.1.1-0.20231001103054-f74a88ed4971
 	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.20231009135225-e0907a2df5d8
-	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231009110130-3c0fb7e268d4
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011120827-7fd4e4c731e5
+	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231009201721-085058b855a5
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.0
 	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231010052333-ca883b562d62
-	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/nova-operator/api v0.3.1-0.20231011062510-41094403563e
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231010103535-821dd87fad95
 	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231009090916-684de667f2c9
-	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.3.1-0.20231005115253-5eccb3cf30f5
+	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231010075512-895575e4ef89
+	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231011130146-67a1837c8c4d
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231011105125-338f29e11fc1
 	github.com/rabbitmq/cluster-operator/v2 v2.5.0
 	k8s.io/apimachinery v0.27.4
 	sigs.k8s.io/controller-runtime v0.15.1
@@ -33,7 +33,7 @@ require (
 	github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/tools v0.14.0 // indirect
 )
 
@@ -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.20231009135225-e0907a2df5d8 //indirect
-	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231009135225-e0907a2df5d8
+	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231011120827-7fd4e4c731e5 //indirect
+	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231011120827-7fd4e4c731e5
 	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

diff --git a/apis/go.sum b/apis/go.sum
@@ -122,16 +122,16 @@ 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/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA=
-github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
+github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
+github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 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/glance-operator/api v0.3.1-0.20231009142602-1164674290d8 h1:K22nah0x7/9lOf14WTiaOSyxsi0KR39HDQGpCrueGOY=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231009142602-1164674290d8/go.mod h1:dJRUMrLRFt3weBS/FDcb+eZvoOGANr1XslmM5RnY8vw=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231010130554-ab1baca2edc1 h1:4lq+opoHznCsw80yXEntIl+R9FT1C0ssmgQn1Qt7zlw=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20231010130554-ab1baca2edc1/go.mod h1:dJRUMrLRFt3weBS/FDcb+eZvoOGANr1XslmM5RnY8vw=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231009062722-38938dcb2b5b h1:TgJRyviHEMquRTEczKKgsGdl6tzA0PIdt7PmtqFlTYk=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20231009062722-38938dcb2b5b/go.mod h1:WPQCwaFKWwIEgqXjZRvJ7+bRUXF5Y/eAqKpBiCEe/Q4=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20231009062721-cda11ea96e2b h1:nA/cI+2fPqcBvM0jCo/WsrngfQQEd8RSGBY7xdFMC+o=
@@ -142,30 +142,30 @@ github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20231006045519-4
 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.20231009135225-e0907a2df5d8 h1:qXeMYpPJgfZef/0fISzAcwW5+v0QJmSzWyBdaHwcWIk=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231009135225-e0907a2df5d8/go.mod h1:Ozg6SxfwOtMkiH553c0XQBWuygZQq4jDQCpR4hZqlxM=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231009135225-e0907a2df5d8 h1:Q912rYHVmjmfJ/9P3lAtoTrbiAiv9f1/GXCCR3SYcDU=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231009135225-e0907a2df5d8/go.mod h1:LOXXvTQCwhOBNd+0FTlgllpa3wqlkI6Vf3Q5QVRVPlw=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231009135225-e0907a2df5d8 h1:/um/XwnIa6BMZxPZbYeEAtjNEtoLb+6Um3fVyS1UHFE=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231009135225-e0907a2df5d8/go.mod h1:qkK/2JzIGOzoctfe0sbL+mSelrEmErAND4vuj1qTU/A=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231009110130-3c0fb7e268d4 h1:w5KreewBoPHSFvmIiIED/wHowUAAovpCyfC2zXgyi2Y=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231009110130-3c0fb7e268d4/go.mod h1:MKtNxShqdW5lCxASkM8/mjsVGJZ6TR6K2UWRV3ccpjQ=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011120827-7fd4e4c731e5 h1:xQI8tkHRVqcrp623yStvQVqmEEgUocq5JUZgf0UE2nQ=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20231011120827-7fd4e4c731e5/go.mod h1:xXAuy7HtWN4p7LF5Q+NHLkwAsKVh0KrzpnuPYIG3XaA=
+github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231011120827-7fd4e4c731e5 h1:9ST0OsJYurogqai8f4pJtM2xumd8DjQ0cNYZ7hD8TYw=
+github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20231011120827-7fd4e4c731e5/go.mod h1:26FhBsCrEsczCiV5fOLT2sQp5gbWCUuQZjmUdFyD/oI=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231011120827-7fd4e4c731e5 h1:tEEXJksRWrzsl7J4j4RGwuSq9uSkSexikdwRi5FJ/DY=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20231011120827-7fd4e4c731e5/go.mod h1:baotYmNGQjRCgu/9LxjrFZzTIT2/4yLktJK8h/Fa0Ig=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231009201721-085058b855a5 h1:iGiIz3vUQO9Y+NaAGrlyraCKOFNLz6rNAQG8MsOpmTo=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20231009201721-085058b855a5/go.mod h1:MKtNxShqdW5lCxASkM8/mjsVGJZ6TR6K2UWRV3ccpjQ=
 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.20231010052333-ca883b562d62 h1:ER2/ryYSeW3/4HBhqoH73DwwR/vQYYPijnR5RpwHPQM=
 github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20231010052333-ca883b562d62/go.mod h1:+wqYebae6ejYXfwpgZ94RtZA7aV4Wg7+KQaN7WAG1Bg=
-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/nova-operator/api v0.3.1-0.20231011062510-41094403563e h1:7FQk4M/tUkl2ZO4akxDMX/s0Xun0hussvhzSx8pllGo=
+github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20231011062510-41094403563e/go.mod h1:xgzjTS76koyJUtLf8Y2m9nTqHBBwxqXDLWNvWxngF7A=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231010103535-821dd87fad95 h1:J9GtHx2SRzgZ/dbt10qTqcdhhrIJ8PwsjEvFbFhEUrc=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20231010103535-821dd87fad95/go.mod h1:wDwOTgy8S/FOMC1O1YS6OK/TXP3WyhSIbMiq44XF+10=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231009090916-684de667f2c9 h1:iOHOH2pcqUTNL1xg1x/JcDlxzDSsbZwJ2MqiigsUq/s=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20231009090916-684de667f2c9/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.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/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231010075512-895575e4ef89 h1:UcOq6nlQM9B4fDxEZkiROr2nI5gXARr55xQrobDW/Yk=
+github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20231010075512-895575e4ef89/go.mod h1:yzAypqVsZ9twlFpItQu9gapaQbFVl+PA3II7NOTW/XY=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231011130146-67a1837c8c4d h1:V1ZI75aJOl3qi7vgFm5Ryj+CDIM8qvt6IeZS9nCev18=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20231011130146-67a1837c8c4d/go.mod h1:cmDpu3koEFV+ssOeEDMjAAW18BvwwmbWXSw0eRIo8yg=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231011105125-338f29e11fc1 h1:RrLO06TElOgJj2mcswRRCjkYIRj2QdCsQsFoCeHKnGc=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20231011105125-338f29e11fc1/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=
@@ -220,8 +220,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
-golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -3373,6 +3373,9 @@ spec:
                         required:
                         - containerImage
                         type: object
+                      imageCacheSize:
+                        default: ""
+                        type: string
                       nodeSelector:
                         additionalProperties:
                           type: string
@@ -3426,6 +3429,7 @@ spec:
                     - databaseInstance
                     - glanceAPIExternal
                     - glanceAPIInternal
+                    - imageCacheSize
                     - secret
                     - storageRequest
                     type: object
@@ -8637,6 +8641,8 @@ spec:
                           serviceUser:
                             default: octavia
                             type: string
+                          transportURLSecret:
+                            type: string
                         required:
                         - containerImage
                         - databaseInstance