coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 06:45:27 +01:00
Code Issues Releases Wiki Activity

Merge pull request #8347 from Yashika0724/fix/thanosruler-statefulset-empty-hash

Browse Source 
fix: compute input hash before creating ThanosRuler StatefulSet
This commit is contained in:
Simon Pasquier
2026-02-02 14:20:07 +01:00
committed by GitHub
parent b8793b1355 4eb498d287
commit b23508bec2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/thanos/operator.go
View File

@@ -564,19 +564,10 @@ func (o *Operator) sync(ctx context.Context, key string) error {
return err
}
shouldCreate := false
if existingStatefulSet == nil {
ssetClient := o.kclient.AppsV1().StatefulSets(tr.Namespace)
sset, err := makeStatefulSet(tr, o.config, ruleConfigMapNames, "", tlsAssets)
if err != nil {
return fmt.Errorf("making thanos statefulset config failed: %w", err)
}
operator.SanitizeSTS(sset)
if _, err := ssetClient.Create(ctx, sset, metav1.CreateOptions{}); err != nil {
return fmt.Errorf("creating thanos statefulset failed: %w", err)
}
return nil
shouldCreate = true
existingStatefulSet = &appsv1.StatefulSet{}
}
if o.rr.DeletionInProgress(existingStatefulSet) {
@@ -595,6 +586,16 @@ func (o *Operator) sync(ctx context.Context, key string) error {
operator.SanitizeSTS(sset)
ssetClient := o.kclient.AppsV1().StatefulSets(tr.Namespace)
if shouldCreate {
logger.Debug("creating statefulset")
if _, err := ssetClient.Create(ctx, sset, metav1.CreateOptions{}); err != nil {
return fmt.Errorf("creating thanos statefulset failed: %w", err)
}
return nil
}
err = o.updateConfigResourcesStatus(ctx, tr, selectedRules)
if err != nil {
return err
@@ -606,7 +607,6 @@ func (o *Operator) sync(ctx context.Context, key string) error {
}
logger.Debug("new hash differs from the existing value", "new", newSSetInputHash, "existing", existingStatefulSet.Annotations[operator.InputHashAnnotationKey])
ssetClient := o.kclient.AppsV1().StatefulSets(tr.Namespace)
if err = k8sutil.ForceUpdateStatefulSet(ctx, ssetClient, sset, func(reason string) {
o.metrics.StsDeleteCreateCounter().Inc()
logger.Info("recreating StatefulSet because the update operation wasn't possible", "reason", reason)