Skip to content

Conversation

stuarta
Copy link

@stuarta stuarta commented Oct 13, 2025

Currently the servicemonitor template is missing the action on the targetLabel: cluster relabelings.

Whilst this is valid, k8s adds in the default action: replace when the servicemonitor is deployed.

If you use ArgoCD to deploy tempo, with the servicemonitors enabled, this results in a delta between the desired state and the live state. Thus argo is constantly in a sync loop, trying to remediate the on-cluster state.

This PR adds action: replace to the servicemonitor template, allowing argocd to successfully apply the desired configuration.

Signed-off-by: Stuart Auchterlonie <stuarta@squashedfrog.net>
@stuarta stuarta changed the title Add action to the servicemonitor relabling for the cluster label [tempo-distributed] Add action to the servicemonitor relabling for the cluster label Oct 15, 2025
@QuentinBisson
Copy link
Collaborator

@stuarta can you bump the chart version?

@stuarta
Copy link
Author

stuarta commented Oct 16, 2025

@stuarta can you bump the chart version?

@QuentinBisson done

@QuentinBisson
Copy link
Collaborator

@stuarta Can you check the DCO? Your commits need to be signed

@stuarta stuarta force-pushed the tempo-distributed-fix-servicemonitor-for-use-with-argocd branch from a7fe9ac to 73baf8e Compare October 16, 2025 11:57
@stuarta
Copy link
Author

stuarta commented Oct 16, 2025

@stuarta Can you check the DCO? Your commits need to be signed

@QuentinBisson i've amended the version bump to include sign off

Signed-off-by: Stuart Auchterlonie <stuarta@squashedfrog.net>
@stuarta stuarta force-pushed the tempo-distributed-fix-servicemonitor-for-use-with-argocd branch from 73baf8e to 786714c Compare October 16, 2025 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants