Update telemetry-operator

We need udpate to have KSM installable
openstack-k8s-operators · Feb 4, 2025 · b88ef34 · b88ef34
1 parent 6291b4d
commit b88ef34
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 6 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -15789,6 +15789,9 @@ spec:
                           enabled:
                             default: true
                             type: boolean
+                          ksmEnabled:
+                            default: true
+                            type: boolean
                           ksmTls:
                             properties:
                               caBundleSecretName:

diff --git a/apis/go.mod b/apis/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250107161655-560140ff3cb0
 	github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241223152937-5c39b092c37f
 	github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250129202756-3e90726f5c23
 	github.com/rabbitmq/cluster-operator/v2 v2.11.0
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
 	github.com/rhobs/observability-operator v0.3.1 // indirect

diff --git a/apis/go.sum b/apis/go.sum
@@ -138,8 +138,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2024101
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
 github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f h1:r2uhK9P3sD7FQYFsABDskQA/ZnjPZ+qNHmMTyMPWheA=
 github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f/go.mod h1:BsHuIfDAQUgjq/QZNrrVDfJzcbIL4rKV6UjlnZqR1u0=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17 h1:ULvJe4a5J2DxJMrS38edqG6ylXtm4WQFh4fNHtVaRYk=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17/go.mod h1:zba6vtrFWehPMhoEo8RRWiVSdAr0o/DgSCXF1zPXxpM=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250129202756-3e90726f5c23 h1:Hi3WRzqsGVEmG1i6SZGctKf0C1wgF8pyX4NjWxjfuOE=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250129202756-3e90726f5c23/go.mod h1:QJ0j5uosHuDAQEMv28R3R3jBBrXFRmFEUcanCuM7P0o=
 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=

diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml
@@ -15886,6 +15886,9 @@ spec:
                           enabled:
                             default: true
                             type: boolean
+                          ksmEnabled:
+                            default: true
+                            type: boolean
                           ksmTls:
                             properties:
                               caBundleSecretName:

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -15789,6 +15789,9 @@ spec:
                           enabled:
                             default: true
                             type: boolean
+                          ksmEnabled:
+                            default: true
+                            type: boolean
                           ksmTls:
                             properties:
                               caBundleSecretName:

diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250107161655-560140ff3cb0
 	github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241223152937-5c39b092c37f
 	github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f
-	github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17
+	github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250129202756-3e90726f5c23
 	github.com/openstack-k8s-operators/test-operator/api v0.5.1-0.20250113125805-be35b077304c
 	github.com/pkg/errors v0.9.1
 	github.com/rabbitmq/cluster-operator/v2 v2.11.0

diff --git a/go.sum b/go.sum
@@ -148,8 +148,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2024101
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20241017142550-a3524acedd49/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
 github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f h1:r2uhK9P3sD7FQYFsABDskQA/ZnjPZ+qNHmMTyMPWheA=
 github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20250107153542-fb9c65d9aa6f/go.mod h1:BsHuIfDAQUgjq/QZNrrVDfJzcbIL4rKV6UjlnZqR1u0=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17 h1:ULvJe4a5J2DxJMrS38edqG6ylXtm4WQFh4fNHtVaRYk=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250113133356-286a91287f17/go.mod h1:zba6vtrFWehPMhoEo8RRWiVSdAr0o/DgSCXF1zPXxpM=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250129202756-3e90726f5c23 h1:Hi3WRzqsGVEmG1i6SZGctKf0C1wgF8pyX4NjWxjfuOE=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20250129202756-3e90726f5c23/go.mod h1:QJ0j5uosHuDAQEMv28R3R3jBBrXFRmFEUcanCuM7P0o=
 github.com/openstack-k8s-operators/test-operator/api v0.5.1-0.20250113125805-be35b077304c h1:eKvsKFG76oMrYqaoWhX4TJzzDcAa4ZKaSmidzCwY5Vs=
 github.com/openstack-k8s-operators/test-operator/api v0.5.1-0.20250113125805-be35b077304c/go.mod h1:E6vgQ4wounIBpoNY+hJK7OVcTXo+/oMdKa7Disr1/h0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

diff --git a/hack/sync-bindata.sh b/hack/sync-bindata.sh
@@ -141,6 +141,9 @@ EOF_CAT
 }
 
 for BUNDLE in $(hack/pin-bundle-images.sh | tr "," " "); do
+    if [[ $BUNDLE == *"EMPTY_SHA"* ]]; then
+        continue
+    fi
     skopeo copy "docker://$BUNDLE" dir:${EXTRACT_DIR}/tmp;
     extract_bundle "${EXTRACT_DIR}/tmp" "${OUT_DATA}/"
 done