Merge pull request openstack-k8s-operators#305 from openstack-k8s-ope…

…rators/renovate/openstack-k8s-operators Update openstack-k8s-operators
ASBishop · May 15, 2023 · 4ebfb36 · 4ebfb36
2 parents e1a2802 + c054ea3
commit 4ebfb36
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 106 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -3090,6 +3090,19 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      images:
+                        properties:
+                          api:
+                            type: string
+                          conductor:
+                            type: string
+                          inspector:
+                            type: string
+                          neutronAgent:
+                            type: string
+                          pxe:
+                            type: string
+                        type: object
                       ironicAPI:
                         properties:
                           containerImage:
@@ -3209,7 +3222,6 @@ spec:
                           transportURLSecret:
                             type: string
                         required:
-                        - containerImage
                         - serviceAccount
                         type: object
                       ironicConductors:
@@ -3344,8 +3356,6 @@ spec:
                             transportURLSecret:
                               type: string
                           required:
-                          - containerImage
-                          - pxeContainerImage
                           - serviceAccount
                           - storageClass
                           - storageRequest
@@ -3506,8 +3516,6 @@ spec:
                           transportURLSecret:
                             type: string
                         required:
-                        - containerImage
-                        - pxeContainerImage
                         - serviceAccount
                         type: object
                       ironicNeutronAgent:
@@ -3581,7 +3589,6 @@ spec:
                             default: ironic
                             type: string
                         required:
-                        - containerImage
                         - secret
                         - serviceAccount
                         type: object

diff --git a/apis/go.mod b/apis/go.mod
@@ -3,18 +3,18 @@ module github.com/openstack-k8s-operators/openstack-operator/apis
 go 1.19
 
 require (
-	github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230503135759-feac84f5479a
-	github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230509104211-270c0b77e1d8
-	github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230511025710-20ef2232badc
+	github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230511085421-6c611258035f
+	github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230515091937-7cd192bfd0fc
+	github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230515060023-1023ee6cefde
 	github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230505165400-46c5e7325f0d
-	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230508065320-dc6d70c5187a
-	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230508152039-4d8f35e8b317
-	github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230509160151-f9e64d8f4f38
-	github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230509190530-aa26f5ea773f
-	github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230505124740-6d38a5ee77b8
-	github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230508110246-aa472422a5d5
-	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230509101501-212dd0094c9b
-	github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230505052453-23304cdb678c
+	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230509224730-a6ec1284c18b
+	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230511141631-53ae172484ba
+	github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230510145530-3c8e9179fb6e
+	github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230511155142-df7a498f323b
+	github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230511141905-4f58dabaa6b7
+	github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230515091936-6fca6f80d9f1
+	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230511064013-34b124dfd9d7
+	github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230511044837-a37d66dae924
 	github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230505070414-b584b0044ed5
 	github.com/rabbitmq/cluster-operator v1.14.0
 	k8s.io/apimachinery v0.26.3
@@ -49,9 +49,9 @@ 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.0.0-20230509160151-f9e64d8f4f38 // indirect; indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect
-	github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230509160151-f9e64d8f4f38
-	github.com/openstack-k8s-operators/ovs-operator/api v0.0.0-20230508150918-026388670942
+	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230510145530-3c8e9179fb6e // indirect; indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect // indirect
+	github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230510145530-3c8e9179fb6e
+	github.com/openstack-k8s-operators/ovs-operator/api v0.0.0-20230511150547-af737c07ef58
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.15.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect

diff --git a/apis/go.sum b/apis/go.sum
@@ -120,36 +120,36 @@ github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
 github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs=
 github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
-github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230503135759-feac84f5479a h1:iWvIek3slHmGK8adhCCJk8Vm0PLeS1QglUUk7HkkQpk=
-github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230503135759-feac84f5479a/go.mod h1:VHo557CgE1hX48JNdBtAlRpSSYquWkqRNcykMKrKATQ=
-github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230509104211-270c0b77e1d8 h1:OGdwzZsDWjXnUCfUZdSmWvdEsK7nAvtpGg+ynLQqSnI=
-github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230509104211-270c0b77e1d8/go.mod h1:fuQmko/6uilDf+AiWR3HeYUYv2JkeLWGF813BF7QEHE=
-github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230511025710-20ef2232badc h1:gP+s8B7YU9OyW4900GXrf3nWuBtwdXQneIQDasHjamA=
-github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230511025710-20ef2232badc/go.mod h1:aX89VD2zUjg6JIrGUezUpclXBjs5hzJLFuuIgaeow90=
+github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230511085421-6c611258035f h1:qb2n8W/7KAaXT053OmI7SlKompnpuSPsTtfpMU3k7Ps=
+github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230511085421-6c611258035f/go.mod h1:VI6XUCOv2tL0fP+GjjGec++q4YiREsO0ewR7lHeUCWQ=
+github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230515091937-7cd192bfd0fc h1:Qa62fkeIb7aM798y/B4h5c+2lWmQfk2ZEPKKypQNY6U=
+github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230515091937-7cd192bfd0fc/go.mod h1:fuQmko/6uilDf+AiWR3HeYUYv2JkeLWGF813BF7QEHE=
+github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230515060023-1023ee6cefde h1:W5mLB2oVfusjLfbTMDlZ9wF4D+mAGP1yp83j3gm1NGM=
+github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230515060023-1023ee6cefde/go.mod h1:aX89VD2zUjg6JIrGUezUpclXBjs5hzJLFuuIgaeow90=
 github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230505165400-46c5e7325f0d h1:84Esxv8bl9AM2W3vRmObzOx6YxLJXIioLrr8+jaQeHw=
 github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230505165400-46c5e7325f0d/go.mod h1:FNMsD6dzcDpx8F6bJIgS/KKjtJufekAPnE8U/xCIpq4=
-github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230508065320-dc6d70c5187a h1:6xRyc423CqqT9dZO4VO6zEECMmg8Dgf2klWtA1RURX4=
-github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230508065320-dc6d70c5187a/go.mod h1:x1uzHpA5k5xN6tjW9jiqP5f9i2d7zckmMoYvpiK1cx4=
-github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230508152039-4d8f35e8b317 h1:yOI9p1zX2rSkqe1t/An7AkB5alHtrSjTnPSDVIqSsvQ=
-github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230508152039-4d8f35e8b317/go.mod h1:9Amhqb6U06GyF/+b6KpBdDR63aanc5tMnNuzisShUUU=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230509160151-f9e64d8f4f38 h1:8fGhB/zXtK4B58ebrm6vdzJT03JmkCr0P+78j0TE+i4=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230509160151-f9e64d8f4f38/go.mod h1:qO1YjgynYksN3GYFrIcrwvAwws22zCzYmn0kOYBn1/A=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230509160151-f9e64d8f4f38 h1:pXWFGATf+kwK3Q6yuHXJ289RB47xmrrDlF+BqdWTOmo=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230509160151-f9e64d8f4f38/go.mod h1:doFbVg0WhS++gy17cbP9/BrCySjCpuqKx7TbvmKPChY=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230509160151-f9e64d8f4f38 h1:k2MwjNtCTlXFfuxs4uRR722R8EVGDJOMSSK3/oiJzt4=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230509160151-f9e64d8f4f38/go.mod h1:gLzjST/ZueiY9Md6vEm+KC6ltBBSZWWg2s7zY1mHrEE=
-github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230509190530-aa26f5ea773f h1:fNqDaLhWvdToR9Lo+B1/uLO+TNOJDEatcPLNANc1a3c=
-github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230509190530-aa26f5ea773f/go.mod h1:wcgsz4TTGKEi3WmPBdOPLlk1DDDZFgAbVLrk5IrnWTw=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230505124740-6d38a5ee77b8 h1:Nwgyw08uejys2fFpp5bj5vlTSqPCdCm7gjNoktYFcNw=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230505124740-6d38a5ee77b8/go.mod h1:OJbXy49Ktmyt13xBzdbHzYUOipKr17kOKUOFa/vB/ls=
-github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230508110246-aa472422a5d5 h1:GuHf+NfpIxCalTa1RiFFVsoXbKQM7wRvvr5e+uRQuf4=
-github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230508110246-aa472422a5d5/go.mod h1:zAux6oHh3kSdfWleA7M+9Y4OWlleaIqns5lZwH0tsP0=
-github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230509101501-212dd0094c9b h1:HcZ1c1YMe8bvJSdFlh1WRZg/2fBTdUCQbaSgCT4U7YI=
-github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230509101501-212dd0094c9b/go.mod h1:4oF+aBlIomGGnI32W0BC9uhbmSWc6nIts/+nsOtdxPs=
-github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230505052453-23304cdb678c h1:tMsAVUJWVQmVZBW50lJLDuOU6SXxoT6ofRmMyE7P0MY=
-github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230505052453-23304cdb678c/go.mod h1:RNt3Q6+D6dmPGxvYmKXgcr9JP/bltbjgif0kM6MeRsE=
-github.com/openstack-k8s-operators/ovs-operator/api v0.0.0-20230508150918-026388670942 h1:B/5NlcQI1vCTiP9gHD1OeN8QSAvkqyaDcz5VTdt8fdc=
-github.com/openstack-k8s-operators/ovs-operator/api v0.0.0-20230508150918-026388670942/go.mod h1:K5s0yoUyGC2ilAmGsQwa0V6TM3AFV752zPpZ1LDIRGk=
+github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230509224730-a6ec1284c18b h1:0UxwOFcNOJtakqiXbua4V4xzV9nuG0mRHqnT85Uaeec=
+github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230509224730-a6ec1284c18b/go.mod h1:x1uzHpA5k5xN6tjW9jiqP5f9i2d7zckmMoYvpiK1cx4=
+github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230511141631-53ae172484ba h1:8AMkHUwzLcfu+LsZqUCLtWP2Er8ZrcXo+TacT7ZcJ7g=
+github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230511141631-53ae172484ba/go.mod h1:DzN08sNlI3hjg1CtkG7wm/OIqh4xIgSbQ6lmyRCkN8g=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230510145530-3c8e9179fb6e h1:svid3nTQbL4IoVwVmh56wroJXDjSnWTaKjNW1tlHxCY=
+github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230510145530-3c8e9179fb6e/go.mod h1:qO1YjgynYksN3GYFrIcrwvAwws22zCzYmn0kOYBn1/A=
+github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230510145530-3c8e9179fb6e h1:z/QqCFsofSl5Axn3j8B41IuDmSJ3Sr2cD32Y1OjXyDo=
+github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230510145530-3c8e9179fb6e/go.mod h1:doFbVg0WhS++gy17cbP9/BrCySjCpuqKx7TbvmKPChY=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230510145530-3c8e9179fb6e h1:RQObdsos4MZVkSxMsWl+qHBU3EuneAZtBRLAqVZDrog=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230510145530-3c8e9179fb6e/go.mod h1:gLzjST/ZueiY9Md6vEm+KC6ltBBSZWWg2s7zY1mHrEE=
+github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230511155142-df7a498f323b h1:O+vWM1gjxdJeDZn9NGhaQx3qbk19PCxYCgZ/qgkSwG4=
+github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230511155142-df7a498f323b/go.mod h1:Sf3QD8LEQJoI5J4MH3np76BC60E0tyIkiv0hZU4+88I=
+github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230511141905-4f58dabaa6b7 h1:UEITUyraddGX6VnGjRHngYsl/rMPAAfF1Gf7aIUherc=
+github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230511141905-4f58dabaa6b7/go.mod h1:2+dVqbcGwrdGpFBIaQeD++TJpHwLg/+CqqP7k44Ls9I=
+github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230515091936-6fca6f80d9f1 h1:utN7N5Hv9Y0kgqci0nHBIAttiHzFmQG4eJRGAt/YZyQ=
+github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230515091936-6fca6f80d9f1/go.mod h1:SoAutTunMyuYOKH80wkwtfU2rb+I4G2EVGO/xRqdn3k=
+github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230511064013-34b124dfd9d7 h1:2t6j7CWz9DWzIcOgN+iLHdPStNNkBUIzXU4k2pdMbCg=
+github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230511064013-34b124dfd9d7/go.mod h1:4oF+aBlIomGGnI32W0BC9uhbmSWc6nIts/+nsOtdxPs=
+github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230511044837-a37d66dae924 h1:h4LMAzGIWScJWNJNWCGz1sj0kc4GkuQBbX4yICjetq4=
+github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230511044837-a37d66dae924/go.mod h1:RNt3Q6+D6dmPGxvYmKXgcr9JP/bltbjgif0kM6MeRsE=
+github.com/openstack-k8s-operators/ovs-operator/api v0.0.0-20230511150547-af737c07ef58 h1:EYZxSGISafmUpM5QYNhm7sPm+rCefSbRxLr1sMXcqG8=
+github.com/openstack-k8s-operators/ovs-operator/api v0.0.0-20230511150547-af737c07ef58/go.mod h1:5bZEE9BuXf+GRWNz2wt+l3/RzdSi7YRDMNxlCar8FXo=
 github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230505070414-b584b0044ed5 h1:4a+LGWh0xoFFEEL0EAIs/5KBoJlyAtLuIqEs3K/2fy0=
 github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230505070414-b584b0044ed5/go.mod h1:NjxUEcFZTFzQ249zPLqRZ2UI0914mFSkfgEfzDzbDhs=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -3090,6 +3090,19 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      images:
+                        properties:
+                          api:
+                            type: string
+                          conductor:
+                            type: string
+                          inspector:
+                            type: string
+                          neutronAgent:
+                            type: string
+                          pxe:
+                            type: string
+                        type: object
                       ironicAPI:
                         properties:
                           containerImage:
@@ -3209,7 +3222,6 @@ spec:
                           transportURLSecret:
                             type: string
                         required:
-                        - containerImage
                         - serviceAccount
                         type: object
                       ironicConductors:
@@ -3344,8 +3356,6 @@ spec:
                             transportURLSecret:
                               type: string
                           required:
-                          - containerImage
-                          - pxeContainerImage
                           - serviceAccount
                           - storageClass
                           - storageRequest
@@ -3506,8 +3516,6 @@ spec:
                           transportURLSecret:
                             type: string
                         required:
-                        - containerImage
-                        - pxeContainerImage
                         - serviceAccount
                         type: object
                       ironicNeutronAgent:
@@ -3581,7 +3589,6 @@ spec:
                             default: ironic
                             type: string
                         required:
-                        - containerImage
                         - secret
                         - serviceAccount
                         type: object