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

…rators/renovate/openstack-k8s-operators Update openstack-k8s-operators
ASBishop · May 31, 2023 · 62aaf85 · 62aaf85
2 parents 187e504 + f81da99
commit 62aaf85
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 45 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -10852,18 +10852,45 @@ spec:
                           transportURLSecret:
                             type: string
                         required:
+                        - computeImage
+                        - initImage
                         - serviceAccount
                         type: object
                       description:
                         default: A ceilometer agent
                         type: string
+                      infraCompute:
+                        properties:
+                          dataplaneInventoryConfigMap:
+                            default: dataplanerole-edpm-compute
+                            type: string
+                          dataplaneSSHSecret:
+                            default: dataplane-ansible-ssh-private-key-secret
+                            type: string
+                          description:
+                            default: An infra compute agent
+                            type: string
+                          extravarsConfigMap:
+                            default: telemetry-infracompute-extravars
+                            type: string
+                          nodeExporterImage:
+                            type: string
+                          playbook:
+                            default: deploy-infra.yaml
+                            type: string
+                          serviceAccount:
+                            type: string
+                        required:
+                        - nodeExporterImage
+                        - serviceAccount
+                        type: object
                       rabbitMqClusterName:
                         default: rabbitmq
                         type: string
                     required:
                     - ceilometerCentral
                     - ceilometerCompute
-                    - rabbitMqClusterName
+                    - infraCompute
                     type: object
                 type: object
             required:

diff --git a/apis/go.mod b/apis/go.mod
@@ -5,18 +5,18 @@ go 1.19
 require (
 	github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230525165456-36eb9d704c58
 	github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230523103335-9c8998bbc8e7
-	github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230530084123-0661a4448b1c
+	github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230531025659-cac21147bd83
 	github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230525130454-a7f0f8afe772
-	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530140223-8d469a030aac
-	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230530145010-0343d3afb6db
+	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530224040-a07073d247ca
+	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230531092248-01ef75f57f85
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230530112722-aca578f65ec9
-	github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230530073843-dcf75fc7c99f
+	github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230531112752-020ab5f5c9c6
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230523102317-8b60f83b1d1f
-	github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230530043145-5ddcfcff15e5
-	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230530075145-122c78de03fc
+	github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230531060543-57aee75577c3
+	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230531135512-ebaeca670b17
 	github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230531135741-735c6d0225a9
 	github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230530114039-8ed00f45bf59
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230530132410-4eab9ab38328
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230531135830-6ee1b2f73696
 	github.com/rabbitmq/cluster-operator v1.14.0
 	k8s.io/apimachinery v0.26.3
 	sigs.k8s.io/controller-runtime v0.14.6

diff --git a/apis/go.sum b/apis/go.sum
@@ -124,34 +124,34 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230525165456-36e
 github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230525165456-36eb9d704c58/go.mod h1:ZnGAntpnCyBM67XeSzyGnrmGc4g+2HeFLszRbRIPNIc=
 github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230523103335-9c8998bbc8e7 h1:5hepKBqyNHpwe6z2BTedeBd0rBZQV//fRa8xmfn+c1o=
 github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230523103335-9c8998bbc8e7/go.mod h1:/pWQSUtScucF3sdAxulYy/3ECZmBjUmzAa1MsjqjaQ0=
-github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230530084123-0661a4448b1c h1:w5FVgr+uJ9NXsA5IzBorTjYVRB7EsMkgIO5b5SJFQ5I=
-github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230530084123-0661a4448b1c/go.mod h1:lTa+TYrpbC5nDXug+ub09DtrzClpv6I4OJ9oG/RLrSk=
+github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230531025659-cac21147bd83 h1:qbNkkR7mT1XhzrImOKPkxwhHdE+6lTKoVeueERgXr+Y=
+github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230531025659-cac21147bd83/go.mod h1:qbcTXn8/LZUlOkwRGFfD5YxNndXCagIBP1Q0BNCBAMg=
 github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230525130454-a7f0f8afe772 h1:MqVwDuzLCnXJ1g+OCcLy/LsjuB8jRZaqR55Vi7ASkKU=
 github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230525130454-a7f0f8afe772/go.mod h1:BuIOgl+UMgzRLUQFmfwvKFuLQIyOVAEJKyjUTnis7ZM=
-github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530140223-8d469a030aac h1:9luicqBBoT4RAohOKbC65uFlC6VaWrut+YI6RVZuCDM=
-github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530140223-8d469a030aac/go.mod h1:wu7hbL15Z6s4YTXZdnhZayLKvuMlDF5YRXgmIWtzHoI=
-github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230530145010-0343d3afb6db h1:bYsRNhI0boabZbN6toCfdokjdOKhWmiiDoT22v/TWRU=
-github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230530145010-0343d3afb6db/go.mod h1:LtZ8b3DYLvX0a89RKbmJgd1q8GcxcOVf7N+bH47a9HU=
+github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530224040-a07073d247ca h1:tQeZDDdQAXXEH87h/FJuZNUSvp+XSuYdmPJHrp2CGE4=
+github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530224040-a07073d247ca/go.mod h1:wu7hbL15Z6s4YTXZdnhZayLKvuMlDF5YRXgmIWtzHoI=
+github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230531092248-01ef75f57f85 h1:kJsB3gXS7wxTJ7bQ+rCe8vFw2+5M8x1tFB08hThPcF0=
+github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230531092248-01ef75f57f85/go.mod h1:LtZ8b3DYLvX0a89RKbmJgd1q8GcxcOVf7N+bH47a9HU=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230530112722-aca578f65ec9 h1:Kf704dtDhI53R2F5c4qOLK1GxGoUTjwPb7NuNFvY5Hc=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230530112722-aca578f65ec9/go.mod h1:r8cMUoS+gnBTrGbmLLECafzhZBh6P9rMwgnrGVspbqE=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230530112722-aca578f65ec9 h1:rTZwRicVFbS4nQ3YJeKGC+Vp/sSXjnWIk4L3wbHalOA=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.0.0-20230530112722-aca578f65ec9/go.mod h1:1Ka9t16pCIdnb/tgjYtL6xeIcN8GFAUxyz6x5UzzDbU=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230530112722-aca578f65ec9 h1:e5pkK2XNAVUQxbXrzjczC/lfs0t08hXrmxliVC2tAR0=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.0.0-20230530112722-aca578f65ec9/go.mod h1:7sbo6DydOwpl8Ex1atTbXIrWYvZ++eSOJ0Z6RphJJ44=
-github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230530073843-dcf75fc7c99f h1:v6CLH5a5etjVt0CfWN23yuoLj/0EtHeDXBJFrrgYgV4=
-github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230530073843-dcf75fc7c99f/go.mod h1:SFVadZE/vIFs4tItbfRg/bArnJ4uMgqVlvCYEp5jqh8=
+github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230531112752-020ab5f5c9c6 h1:ErxECkoS4an37SvD4aeXwRBRqu88mrugDKL3/lWo6SA=
+github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230531112752-020ab5f5c9c6/go.mod h1:SFVadZE/vIFs4tItbfRg/bArnJ4uMgqVlvCYEp5jqh8=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230523102317-8b60f83b1d1f h1:RljVu7USKBTSL6Y3wbn6TKYUddk09T8MquvqbBjaJ74=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230523102317-8b60f83b1d1f/go.mod h1:YRgmQI2Z0IbQnDrU1jqvZqntSBmCmBU9CSbzoqPjrPw=
-github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230530043145-5ddcfcff15e5 h1:KsKLeEbZiVS61DOCa5j8ikeULk2p3rgTWNgvXAXojls=
-github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230530043145-5ddcfcff15e5/go.mod h1:1LNwRed6Fc8a8IyoD5CbyGclETGOaEZK2iU4XVBP7xo=
-github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230530075145-122c78de03fc h1:wSWdDazM8Sn1KnvjzTaELLYpfbYfZZOXCKNmWlU5RfE=
-github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230530075145-122c78de03fc/go.mod h1:ACActQWcZs9LW/hXnA7LO9GxlMDWt3cnJxc6zoGMOGw=
+github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230531060543-57aee75577c3 h1:88OgmNS6dSIWUqdBWROYtF72HZ4zrx/NdshUc80pX+k=
+github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230531060543-57aee75577c3/go.mod h1:vrwzbSY1TO+zioWcARGTofylvqbLM3eRxeDHgRQOFA8=
+github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230531135512-ebaeca670b17 h1:dj9VyVkml2ZAHm4gI82hussEkkHJ0mTvIAQQTIKtQt8=
+github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230531135512-ebaeca670b17/go.mod h1:ACActQWcZs9LW/hXnA7LO9GxlMDWt3cnJxc6zoGMOGw=
 github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230531135741-735c6d0225a9 h1:YHp8t3LnWffoOwK7J+RHjwyLE0VMGDj3VJuKTrNm3Rk=
 github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230531135741-735c6d0225a9/go.mod h1:xxFGyA9cJpE0LPjKcM07cGiUT1NWFK4uGOXtExYtaU4=
 github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230530114039-8ed00f45bf59 h1:PSo7yhe9eNqcaH/9TWAvBtA0eOCIWe0cPDAr/Llo5e4=
 github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230530114039-8ed00f45bf59/go.mod h1:WzC+lpJz+bwU+J6N18Y2OgVnwMsi4sWSQRIiHKLobOU=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230530132410-4eab9ab38328 h1:GB4n4/8/5QpToRfbc0sqNZCFoFk/H7dEEx5/aJYDIAU=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230530132410-4eab9ab38328/go.mod h1:F5x2m1UzRAThNjSxCPCu6l/v0Pfg6g6BiK8/c7ux0ls=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230531135830-6ee1b2f73696 h1:q80l51HNdusUKJ7IdN0oc5S6nPWOTgNoXLygW6fP8qc=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230531135830-6ee1b2f73696/go.mod h1:F5x2m1UzRAThNjSxCPCu6l/v0Pfg6g6BiK8/c7ux0ls=
 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=

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -10852,18 +10852,45 @@ spec:
                           transportURLSecret:
                             type: string
                         required:
+                        - computeImage
+                        - initImage
                         - serviceAccount
                         type: object
                       description:
                         default: A ceilometer agent
                         type: string
+                      infraCompute:
+                        properties:
+                          dataplaneInventoryConfigMap:
+                            default: dataplanerole-edpm-compute
+                            type: string
+                          dataplaneSSHSecret:
+                            default: dataplane-ansible-ssh-private-key-secret
+                            type: string
+                          description:
+                            default: An infra compute agent
+                            type: string
+                          extravarsConfigMap:
+                            default: telemetry-infracompute-extravars
+                            type: string
+                          nodeExporterImage:
+                            type: string
+                          playbook:
+                            default: deploy-infra.yaml
+                            type: string
+                          serviceAccount:
+                            type: string
+                        required:
+                        - nodeExporterImage
+                        - serviceAccount
+                        type: object
                       rabbitMqClusterName:
                         default: rabbitmq
                         type: string
                     required:
                     - ceilometerCentral
                     - ceilometerCompute
-                    - rabbitMqClusterName
+                    - infraCompute
                     type: object
                 type: object
             required:

diff --git a/go.mod b/go.mod
@@ -9,21 +9,21 @@ require (
 	github.com/openstack-k8s-operators/cinder-operator/api v0.0.0-20230525165456-36eb9d704c58
 	github.com/openstack-k8s-operators/dataplane-operator/api v0.0.0-20230530163832-b08208382475
 	github.com/openstack-k8s-operators/glance-operator/api v0.0.0-20230523103335-9c8998bbc8e7
-	github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230530084123-0661a4448b1c
+	github.com/openstack-k8s-operators/horizon-operator/api v0.0.0-20230531025659-cac21147bd83
 	github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230525130454-a7f0f8afe772
-	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530140223-8d469a030aac
-	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230530145010-0343d3afb6db
+	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-20230530224040-a07073d247ca
+	github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230531092248-01ef75f57f85
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.0.0-20230530112722-aca578f65ec9
-	github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230530073843-dcf75fc7c99f
+	github.com/openstack-k8s-operators/manila-operator/api v0.0.0-20230531112752-020ab5f5c9c6
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.0.0-20230523102317-8b60f83b1d1f
-	github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230530043145-5ddcfcff15e5
-	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230530075145-122c78de03fc
+	github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-20230531060543-57aee75577c3
+	github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20230531135512-ebaeca670b17
 	github.com/openstack-k8s-operators/openstack-ansibleee-operator/api v0.0.0-20230530152000-1f646021be55
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.0.0-20230524141327-a53b273227de
-	github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20230530143201-64e7571bd7c4
+	github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20230531151105-187e504f91ac
 	github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230531135741-735c6d0225a9
 	github.com/openstack-k8s-operators/placement-operator/api v0.0.0-20230530114039-8ed00f45bf59
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230530132410-4eab9ab38328
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.0.0-20230531135830-6ee1b2f73696
 	github.com/operator-framework/api v0.17.3
 	github.com/rabbitmq/cluster-operator v1.14.0
 	go.uber.org/zap v1.24.0