Skip to content

Commit b6df833

Browse files
jlarribajlarriba
committed
Adjust to use CloudKittyCore to avoid exposing images in the ControlPlane
1 parent 05c41e1 commit b6df833

File tree

8 files changed

+16
-19
lines changed

8 files changed

+16
-19
lines changed

‎apis/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ 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
7271
github.com/imdario/mergo v0.3.16 // indirect
7372
github.com/josharian/intern v1.0.0 // indirect
7473
github.com/json-iterator/go v1.1.12 // indirect
@@ -120,4 +119,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
120119
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
121120

122121
// Test CloudKitty
123-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28
122+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250929100334-4b33abe60c1f

‎apis/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ 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=
6563
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
6664
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
67-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28 h1:9H+DxrR9/zzJtTZ9HeC7Ngxq83fLyZU6Z2sr4J5HOcI=
68-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
65+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250929100334-4b33abe60c1f h1:JbxA0olLZn1nwZhuIP3+2r6VDKc0uTrh+HgzHvsQFDw=
66+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250929100334-4b33abe60c1f/go.mod h1:v4Stbc6YFVR3r7ofSuErpTJ9Ki2Ka9Fs8S+dgiNqx60=
6967
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7068
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7169
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

‎config/operator/default_images.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ spec:
5454
- name: RELATED_IMAGE_CINDER_VOLUME_IMAGE_URL_DEFAULT
5555
value: quay.io/podified-antelope-centos9/openstack-cinder-volume:current-podified
5656
- name: RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT
57-
value: quay.io/podified-master-centos9/openstack-cloudkitty-api:current-podified
57+
value: quay.io/podified-master-centos10/openstack-cloudkitty-api:current-podified
5858
- name: RELATED_IMAGE_CLOUDKITTY_PROCESSOR_IMAGE_URL_DEFAULT
59-
value: quay.io/podified-master-centos9/openstack-cloudkitty-processor:current-podified
59+
value: quay.io/podified-master-centos10/openstack-cloudkitty-processor:current-podified
6060
- name: RELATED_IMAGE_DESIGNATE_API_IMAGE_URL_DEFAULT
6161
value: quay.io/podified-antelope-centos9/openstack-designate-api:current-podified
6262
- name: RELATED_IMAGE_DESIGNATE_BACKENDBIND9_IMAGE_URL_DEFAULT

‎config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ spec:
362362
cloudkitty:
363363
apiTimeout: 0
364364
cloudKittyAPI:
365-
containerImage: quay.io/jwysogla/cloudkitty-api:latest
366365
override:
367366
service:
368367
internal:
@@ -381,7 +380,6 @@ spec:
381380
public: {}
382381
caBundleSecretName: combined-ca-bundle
383382
cloudKittyProc:
384-
containerImage: quay.io/jwysogla/cloudkitty-processor:latest
385383
replicas: 1
386384
resources: {}
387385
tls:

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ 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
7978
github.com/imdario/mergo v0.3.16 // indirect
8079
github.com/josharian/intern v1.0.0 // indirect
8180
github.com/json-iterator/go v1.1.12 // indirect
@@ -131,4 +130,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
131130
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
132131

133132
// Test CloudKitty
134-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28
133+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250929100334-4b33abe60c1f

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +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=
6563
github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
6664
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
6765
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
6866
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
69-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28 h1:9H+DxrR9/zzJtTZ9HeC7Ngxq83fLyZU6Z2sr4J5HOcI=
70-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
67+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250929100334-4b33abe60c1f h1:JbxA0olLZn1nwZhuIP3+2r6VDKc0uTrh+HgzHvsQFDw=
68+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250929100334-4b33abe60c1f/go.mod h1:v4Stbc6YFVR3r7ofSuErpTJ9Ki2Ka9Fs8S+dgiNqx60=
7169
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7270
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7371
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

‎hack/export_related_images.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope
3636
export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/sg-core:latest
3737
export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/mysqld-exporter:v0.15.1
3838
export RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT=registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0
39-
export RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-cloudkitty-api:current-podified
40-
export RELATED_IMAGE_CLOUDKITTY_PROCESSOR_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-expocloudkitty-processor:current-podified
39+
export RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos10/openstack-cloudkitty-api:current-podified
40+
export RELATED_IMAGE_CLOUDKITTY_PROCESSOR_IMAGE_URL_DEFAULT=quay.io/podified-master-centos10/openstack-cloudkitty-processor:current-podified
4141
export RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
4242
export RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-evaluator:current-podified
4343
export RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-notifier:current-podified

‎pkg/openstack/telemetry.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
377377
instance.Spec.Telemetry.Template.Ceilometer.CeilometerSpecCore.DeepCopyInto(&telemetry.Spec.Ceilometer.CeilometerSpecCore)
378378
instance.Spec.Telemetry.Template.Logging.DeepCopyInto(&telemetry.Spec.Logging)
379379
instance.Spec.Telemetry.Template.MetricStorage.DeepCopyInto(&telemetry.Spec.MetricStorage)
380+
instance.Spec.Telemetry.Template.CloudKitty.CloudKittySpecCore.DeepCopyInto(&telemetry.Spec.CloudKitty.CloudKittySpecCore)
380381

381382
telemetry.Spec.Ceilometer.Enabled = ptr.To(*instance.Spec.Telemetry.Template.Ceilometer.Enabled)
382383
telemetry.Spec.Autoscaling.Enabled = ptr.To(*instance.Spec.Telemetry.Template.Autoscaling.Enabled)
@@ -391,6 +392,8 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
391392
telemetry.Spec.Autoscaling.Aodh.EvaluatorImage = *version.Status.ContainerImages.AodhEvaluatorImage
392393
telemetry.Spec.Autoscaling.Aodh.NotifierImage = *version.Status.ContainerImages.AodhNotifierImage
393394
telemetry.Spec.Autoscaling.Aodh.ListenerImage = *version.Status.ContainerImages.AodhListenerImage
395+
telemetry.Spec.CloudKitty.CloudKittyAPI.ContainerImage = *version.Status.ContainerImages.CloudKittyAPIImage
396+
telemetry.Spec.CloudKitty.CloudKittyProc.ContainerImage = *version.Status.ContainerImages.CloudKittyProcImage
394397

395398
telemetry.Spec.Ceilometer.KSMImage = *getImg(version.Status.ContainerImages.KsmImage, &missingImageDefault)
396399
telemetry.Spec.Ceilometer.MysqldExporterImage = *getImg(version.Status.ContainerImages.CeilometerMysqldExporterImage, &missingImageDefault)
@@ -484,7 +487,9 @@ func TelemetryImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStac
484487
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhAPIImage, version.Status.ContainerImages.AodhAPIImage) ||
485488
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhEvaluatorImage, version.Status.ContainerImages.AodhEvaluatorImage) ||
486489
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhNotifierImage, version.Status.ContainerImages.AodhNotifierImage) ||
487-
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhListenerImage, version.Status.ContainerImages.AodhListenerImage) {
490+
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhListenerImage, version.Status.ContainerImages.AodhListenerImage) ||
491+
!stringPointersEqual(controlPlane.Status.ContainerImages.CloudKittyAPIImage, version.Status.ContainerImages.CloudKittyAPIImage) ||
492+
!stringPointersEqual(controlPlane.Status.ContainerImages.CloudKittyProcImage, version.Status.ContainerImages.CloudKittyProcImage) {
488493
Log.Info("Telemetry images do not match")
489494
return false
490495
}

0 commit comments

Comments
 (0)