Skip to content

Commit bdccc2f

Browse files
jlarribajlarriba
committed
Test unmerged version of the telemetry-operator
1 parent 47f199f commit bdccc2f

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

‎apis/go.mod‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250913143437-ca03bf1e106a
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
@@ -68,6 +68,7 @@ require (
6868
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
6969
github.com/google/uuid v1.6.0 // indirect
7070
github.com/gophercloud/gophercloud v1.14.1 // indirect
71+
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba // indirect
7172
github.com/imdario/mergo v0.3.16 // indirect
7273
github.com/josharian/intern v1.0.0 // indirect
7374
github.com/json-iterator/go v1.1.12 // indirect
@@ -117,3 +118,6 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
117118

118119
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
119120
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
121+
122+
// Test CloudKitty
123+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923074303-c84156690ab3

‎apis/go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,12 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6060
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6161
github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw=
6262
github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
63+
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba h1:P5Wgp2HfGfNPLCPpS+YqquKdrrl4tW0El7VX23D6vtg=
64+
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba/go.mod h1:OBAgJh0mLYRvziBzBKr4/anrPHqGY9qEfuNXCpnUNi0=
6365
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
6466
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
67+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923074303-c84156690ab3 h1:XZ8Ti67ideOBe3HUaCC0fDWWryKFvPdejPrcjzg6NsE=
68+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923074303-c84156690ab3/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
6569
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
6670
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
6771
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -105,8 +109,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a
105109
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327/go.mod h1:FTwd2VQgKqSngqCXVW3uZ9wqm50rIFHyVBBJi/6GFl4=
106110
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046 h1:RgLAlW1BAxs60piMF+uKRhab6D9u/e0Jb/XvALrwRjY=
107111
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046/go.mod h1:j9yGw80eA38kEvHEkx/BONqIhLnKFmpjAtyAB8S817E=
108-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049 h1:mTh1657W/9SG6l8cLcowFFpGlGFp0P13B0L7mc3y+kw=
109-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
112+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182 h1:Ea+FZQOW0Eha1jorgSECFeqI9UrKz8TZlGnSM7X8Yf4=
113+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182/go.mod h1:3Im8PFiRKPaOZpOuqYShJRN2O2pfjUuhDTUpW4KMHZw=
110114
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257 h1:vuPPSXGCKKCOPs3AV5wdViPOSsU6wqSHLGF4JJEEIZI=
111115
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257/go.mod h1:pnJ/UY5Qvr565W2wKQU8WRyR936VVCkjcieuTXKDHfo=
112116
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d h1:lSRMftk/MbN4qd8ihHh9ucdX4sfR/HUudEcy2h/BNhQ=
@@ -137,8 +141,6 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025071
137141
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
138142
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764 h1:uhGPaufK6M4E8GpE/5hQ3dhvcDLfec1StPvUVcRKbY0=
139143
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764/go.mod h1:ygMZ5eETT8vzs85/u/vkPGFxziRPXcp3G2TRBQnuV/E=
140-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072532-5152878cf152 h1:uszH4lxCwh2lYWIR+ulX498uPgqnBSMv/cJZHtu0WKc=
141-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072532-5152878cf152/go.mod h1:fImjJcK574r/zy3JOH2FBnfLYzk9CHMLAfdZrhXFf20=
142144
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250919081639-e7427981ed8c h1:7MP0Nakns0cAV7zCqjbrHxJQ7mnDU0rYuRWAQbU3RwM=
143145
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250919081639-e7427981ed8c/go.mod h1:d666c/fR+FvqA6f2TgsbxdPSRIM43ooUAO4AvcC+n5E=
144146
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎go.mod‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250913143437-ca03bf1e106a
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046
21-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049
21+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250922082314-c83d83092a04
@@ -75,6 +75,7 @@ require (
7575
github.com/google/gofuzz v1.2.0 // indirect
7676
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
7777
github.com/gophercloud/gophercloud v1.14.1 // indirect
78+
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba // indirect
7879
github.com/imdario/mergo v0.3.16 // indirect
7980
github.com/josharian/intern v1.0.0 // indirect
8081
github.com/json-iterator/go v1.1.12 // indirect
@@ -128,3 +129,6 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
128129

129130
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
130131
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
132+
133+
// Test CloudKitty
134+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923074303-c84156690ab3

‎go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,14 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6060
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6161
github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw=
6262
github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
63+
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba h1:P5Wgp2HfGfNPLCPpS+YqquKdrrl4tW0El7VX23D6vtg=
64+
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba/go.mod h1:OBAgJh0mLYRvziBzBKr4/anrPHqGY9qEfuNXCpnUNi0=
6365
github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
6466
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
6567
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
6668
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
69+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923074303-c84156690ab3 h1:XZ8Ti67ideOBe3HUaCC0fDWWryKFvPdejPrcjzg6NsE=
70+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923074303-c84156690ab3/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
6771
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
6872
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
6973
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -109,8 +113,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a
109113
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327/go.mod h1:FTwd2VQgKqSngqCXVW3uZ9wqm50rIFHyVBBJi/6GFl4=
110114
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046 h1:RgLAlW1BAxs60piMF+uKRhab6D9u/e0Jb/XvALrwRjY=
111115
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046/go.mod h1:j9yGw80eA38kEvHEkx/BONqIhLnKFmpjAtyAB8S817E=
112-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049 h1:mTh1657W/9SG6l8cLcowFFpGlGFp0P13B0L7mc3y+kw=
113-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
116+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182 h1:Ea+FZQOW0Eha1jorgSECFeqI9UrKz8TZlGnSM7X8Yf4=
117+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182/go.mod h1:3Im8PFiRKPaOZpOuqYShJRN2O2pfjUuhDTUpW4KMHZw=
114118
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257 h1:vuPPSXGCKKCOPs3AV5wdViPOSsU6wqSHLGF4JJEEIZI=
115119
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257/go.mod h1:pnJ/UY5Qvr565W2wKQU8WRyR936VVCkjcieuTXKDHfo=
116120
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d h1:lSRMftk/MbN4qd8ihHh9ucdX4sfR/HUudEcy2h/BNhQ=
@@ -147,8 +151,6 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025071
147151
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
148152
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764 h1:uhGPaufK6M4E8GpE/5hQ3dhvcDLfec1StPvUVcRKbY0=
149153
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250909184158-7873da060764/go.mod h1:ygMZ5eETT8vzs85/u/vkPGFxziRPXcp3G2TRBQnuV/E=
150-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072532-5152878cf152 h1:uszH4lxCwh2lYWIR+ulX498uPgqnBSMv/cJZHtu0WKc=
151-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250917072532-5152878cf152/go.mod h1:fImjJcK574r/zy3JOH2FBnfLYzk9CHMLAfdZrhXFf20=
152154
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250917084400-574547d2fb8e h1:IbD2qDPxOeelICnA4DHMMKxN95gNkx2PLWnr/1CrZtA=
153155
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20250917084400-574547d2fb8e/go.mod h1:hxq4jN9hQNJAKewb5oOchF3VrucA4q5msrkx9zln8q8=
154156
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250919081639-e7427981ed8c h1:7MP0Nakns0cAV7zCqjbrHxJQ7mnDU0rYuRWAQbU3RwM=

0 commit comments

Comments
 (0)