Fixed go.mod

Author: jlarriba

apis/go.mod

@@ -126,4 +126,4 @@ replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-oper
 replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
 
 // Test CloudKitty
-replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872
+replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872 //allow-merging

apis/go.sum

@@ -102,54 +102,6 @@ github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U=
 github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
-<<<<<<< HEAD
-github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250916162815-94a54170a2be h1:tX0xh1l8nKSlzf29qZ5dd7BrDl1TMFaqo4X7jrMpQrk=
-github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250916162815-94a54170a2be/go.mod h1:t1OgOfbkr5e0GnYb/8DVF7ipTBvnkTiaajshsX/lEGc=
-github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250916151837-4aab51f61506 h1:VM1A3GoWpaWut/pJ8ahyqIIrcorA5ifB9LCiJvjmaSU=
-github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250916151837-4aab51f61506/go.mod h1:BO46dGzGssyFxTteYsjW/x+LhP5QE8OQYqWfSCGxmrw=
-github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250916093535-a95d6d012ab5 h1:+xyYZbMdO++xTvHccYwKVBknGDzWOX2l7f2dwGbRWg4=
-github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250916093535-a95d6d012ab5/go.mod h1:gNLkZ4BQP50FeDAL0praoCRjsB8me4LDf1e9PSIm2ac=
-github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250913143437-ca03bf1e106a h1:sKv2lK5LYt1kVK/S8VawMzpzVf2V9gv3sFX8a2tuIEw=
-github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250913143437-ca03bf1e106a/go.mod h1:HbXLqb/ud09w9MmDqdoj0DoF3z78FGc0iCP/FPzGRaM=
-github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327 h1:Suiu+GI++jNb3mGhggmtUFV0BhWHJAYGVH28caFBMns=
-github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327/go.mod h1:FTwd2VQgKqSngqCXVW3uZ9wqm50rIFHyVBBJi/6GFl4=
-github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046 h1:RgLAlW1BAxs60piMF+uKRhab6D9u/e0Jb/XvALrwRjY=
-github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046/go.mod h1:j9yGw80eA38kEvHEkx/BONqIhLnKFmpjAtyAB8S817E=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182 h1:Ea+FZQOW0Eha1jorgSECFeqI9UrKz8TZlGnSM7X8Yf4=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182/go.mod h1:3Im8PFiRKPaOZpOuqYShJRN2O2pfjUuhDTUpW4KMHZw=
-github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257 h1:vuPPSXGCKKCOPs3AV5wdViPOSsU6wqSHLGF4JJEEIZI=
-github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257/go.mod h1:pnJ/UY5Qvr565W2wKQU8WRyR936VVCkjcieuTXKDHfo=
-github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d h1:lSRMftk/MbN4qd8ihHh9ucdX4sfR/HUudEcy2h/BNhQ=
-github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d/go.mod h1:7ZuNZNtwRYklS2H5E5YSjsHOI2sYbAl1AD+N0W/G+8A=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04 h1:JqJd39rF8rD9KIHmOEFbHP8UyYgttfuouj+kAFNtymU=
-github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04/go.mod h1:SmKRclrynSSRCXSLOoWlETalJPvt62ObHsfW8iPvtDA=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250823121217-7e1cd2e3dd03 h1:tSMLVApQ4j4YJ56TGIYzaNo2Zh/ruDAY0wCcOEVKoIQ=
-github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250823121217-7e1cd2e3dd03/go.mod h1:nachFP0Yicw/e8ZlqZzvnBN6w9kjMcnqrhaDw36PGjw=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250922082314-c83d83092a04 h1:j5P/ehO4bQ+VqNvqNiX7N/R8wnBweFy7MX685nh4mmY=
-github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250922082314-c83d83092a04/go.mod h1:WbDAhyvX2UTyK9LzYZKjRvEGdn2fsQJHUo5l2J5q/vg=
-github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250919144954-99877452c35b h1:CsmxE47qBRAFve2mCe/SodjO/VrAGbYJ6UPQkcfa1XQ=
-github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250919144954-99877452c35b/go.mod h1:YKBaz8jLEGmgUy6FLTm3aCRzlL1wTvdYQiOELvXrtbI=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250919091623-97dfb39624e3 h1:jLLHwgEbfglcSfJbqWP4vEqMs0xzu5QoubSpYDKOTIk=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250919091623-97dfb39624e3/go.mod h1:2I8YZyKvq2ACOnIBFpdUd9TdIaI2yeDu/9VC0HRDfPo=
-github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250916093251-7cfe04efd126 h1:N2n/iHM9w31XpxHOLU0gzRhYRPjpFN0Vd9F48SplL4E=
-github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20250916093251-7cfe04efd126/go.mod h1:j4Dz5KVJbnkHZa2wNp4vvH5vzBGUSd+E8m4WDdyCqd4=
-github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250917121202-3d3857d13c4c h1:Mu7f4AagVqeSnn8dktHfSPKeaKOCuhTSc4B0yWMNAZ0=
-github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250917121202-3d3857d13c4c/go.mod h1:TMosRCd2EszCD0kugIDUeXFymuZRnw+CicBwLmExYR4=
-github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250916093536-0423d6aadfb4 h1:FGLm70RGFTHA9jAxf5M8ADDjGyWRl9QSHNLVN3uy+Og=
-github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250916093536-0423d6aadfb4/go.mod h1:qFLvSjUjUAD5uS8m2yBhYO5X6ViIWxWF0qtYCaj+wo0=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52 h1:QuOy7xZzbIfPKDQ940r+z5fsqr3aTAdQFjDOXuFY2Gw=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250912113640-0e6ddd45ee52/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5 h1:kjCoac5RqGN2m3Iw0+XmaiEwo/FuGB9MfWAeHT+6caI=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250918124008-71fb50adbeb5/go.mod h1:gxQk8WOaA2lQ9oy4ZKXK35oKuD6pKo4Ce2XkUkFjkE4=
-github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
-github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
-github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=
-github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
-github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764 h1:uhGPaufK6M4E8GpE/5hQ3dhvcDLfec1StPvUVcRKbY0=
-github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764/go.mod h1:ygMZ5eETT8vzs85/u/vkPGFxziRPXcp3G2TRBQnuV/E=
-github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250919081639-e7427981ed8c h1:7MP0Nakns0cAV7zCqjbrHxJQ7mnDU0rYuRWAQbU3RwM=
-github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250919081639-e7427981ed8c/go.mod h1:d666c/fR+FvqA6f2TgsbxdPSRIM43ooUAO4AvcC+n5E=
-=======
 github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250929084617-b8b724a249e9 h1:WbY0iMJE4gk0AfBnt0WdIL6NdrQbuSUvtmEjeup5FEs=
 github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250929084617-b8b724a249e9/go.mod h1:wJxERkmbVx2a0WGBax/fBbrYhAMSRGrP+rfDTNONlUs=
 github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250926111043-e3436cc7fde8 h1:qzOcj+IpIh2BGoeAJO0wt0sfeD4eUp0fw8WqeiTL3LM=
@@ -194,11 +146,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025071
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
 github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250922191944-7d54e7c80282 h1:wrBO9Xe8CqXlZJNG8yuBOtVqebiJR+02sKPTMtNMi9w=
 github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250922191944-7d54e7c80282/go.mod h1:x47kL081iHPPLBL7AcNuX2ossjJP+xXO6RMgG21ATKM=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250926151751-fb90e2d5d545 h1:cscDXcjLvEwUsV4U6fPdMSB/M4k7CeuejOacINmwPnE=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250926151751-fb90e2d5d545/go.mod h1:nNPrAB/FKxbK8X0nyjSlbH9jNY3V5nWQ6+H5z/OkWuI=
 github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250925120222-c0b444994d55 h1:Eq8IMNekzmAbe8mlGtsmCejXOSqb6AW9ieUM9KBMV+A=
 github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250925120222-c0b444994d55/go.mod h1:cIeTQmrUXSxzHuv/W9hxMk02z5BT+4RJl9MdXX20BsA=
->>>>>>> main
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

bindata/rbac/telemetry-operator-rbac.yaml

@@ -183,7 +183,6 @@ rules:
   resources:
     - keystoneendpoints
     - keystoneservices
-<<<<<<< HEAD
   verbs:
     - create
     - delete
@@ -196,8 +195,6 @@ rules:
     - loki.grafana.com
   resources:
     - lokistacks
-=======
->>>>>>> main
   verbs:
     - create
     - delete
@@ -357,12 +354,9 @@ rules:
   resources:
     - autoscalings
     - ceilometers
-<<<<<<< HEAD
     - cloudkitties
     - cloudkittyapis
     - cloudkittyprocs
-=======
->>>>>>> main
     - loggings
     - metricstorages
     - telemetries
@@ -379,10 +373,7 @@ rules:
   resources:
     - autoscalings/finalizers
     - ceilometers/finalizers
-<<<<<<< HEAD
     - cloudkitties/finalizers
-=======
->>>>>>> main
     - loggings/finalizers
     - metricstorages/finalizers
   verbs:
@@ -394,12 +385,9 @@ rules:
   resources:
     - autoscalings/status
     - ceilometers/status
-<<<<<<< HEAD
     - cloudkitties/status
     - cloudkittyapis/status
     - cloudkittyprocs/status
-=======
->>>>>>> main
     - loggings/status
     - metricstorages/status
     - telemetries/status
@@ -410,11 +398,8 @@ rules:
 - apiGroups:
     - telemetry.openstack.org
   resources:
-<<<<<<< HEAD
     - cloudkittyapis/finalizers
     - cloudkittyprocs/finalizers
-=======
->>>>>>> main
     - telemetries/finalizers
   verbs:
     - patch

go.mod

@@ -133,10 +133,8 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
 // custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
 replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
 
-<<<<<<< HEAD
-// Test CloudKitty
-replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872
-=======
 // pin to support rabbitmq 2.16.1 rebase
 replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
->>>>>>> main
+
+// Test CloudKitty
+replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930133019-ac359d938872 //allow-merging