Adds default container annotation to Thanos Ruler pod (prometheus-ope…

…rator#3981)
pasancario · Apr 14, 2021 · 0b7eff8 · 0b7eff8
1 parent 39f8c96
commit 0b7eff8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/thanos/statefulset.go b/pkg/thanos/statefulset.go
@@ -358,6 +358,8 @@ func makeStatefulSetSpec(tr *monitoringv1.ThanosRuler, config Config, ruleConfig
 	podLabels[thanosRulerLabel] = tr.Name
 	finalLabels := config.Labels.Merge(podLabels)
 
+	podAnnotations["kubectl.kubernetes.io/default-container"] = "thanos-ruler"
+
 	storageVolName := volumeName(tr.Name)
 	if tr.Spec.Storage != nil {
 		if tr.Spec.Storage.VolumeClaimTemplate.Name != "" {

diff --git a/pkg/thanos/statefulset_test.go b/pkg/thanos/statefulset_test.go
@@ -101,10 +101,10 @@ func TestPodLabelsAnnotations(t *testing.T) {
 		},
 	}, defaultTestConfig, nil, "")
 	require.NoError(t, err)
-	if _, ok := sset.Spec.Template.ObjectMeta.Labels["testlabel"]; !ok {
+	if val, ok := sset.Spec.Template.ObjectMeta.Labels["testlabel"]; !ok || val != "testvalue" {
 		t.Fatal("Pod labels are not properly propagated")
 	}
-	if !reflect.DeepEqual(annotations, sset.Spec.Template.ObjectMeta.Annotations) {
+	if val, ok := sset.Spec.Template.ObjectMeta.Annotations["testannotation"]; !ok || val != "testvalue" {
 		t.Fatal("Pod annotations are not properly propagated")
 	}
 }