mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-20 19:29:10 +00:00
Code Activity

pkg/prometheus: Do not pass podManagementPolicy and stick with Parallel

Browse source
This commit is contained in:
Matthias Loibl 2018-12-13 15:46:48 +01:00
parent a174c8b128
commit ee8448fdac
No known key found for this signature in database
GPG key ID: B1C7DF661ABB2C1A
3 changed files with 21 additions and 31 deletions

15
pkg/prometheus/operator.go
View file

@ -1013,13 +1013,13 @@ func (c *Operator) sync(key string) error {
return err
}
sset, err := makeStatefulSet(*p, &c.config, ruleConfigMapNames, newSSetInputHash)
if err != nil {
return errors.Wrap(err, "making statefulset failed")
}
if !exists {
level.Debug(c.logger).Log("msg", "no current Prometheus statefulset found")
sset, err := makeStatefulSet(*p, "", &c.config, ruleConfigMapNames, newSSetInputHash)
if err != nil {
return errors.Wrap(err, "making statefulset failed")
}
level.Debug(c.logger).Log("msg", "creating Prometheus statefulset")
if _, err := ssetClient.Create(sset); err != nil {
return errors.Wrap(err, "creating statefulset failed")
@ -1033,11 +1033,6 @@ func (c *Operator) sync(key string) error {
return nil
}
sset, err := makeStatefulSet(*p, obj.(*appsv1.StatefulSet).Spec.PodManagementPolicy, &c.config, ruleConfigMapNames, newSSetInputHash)
if err != nil {
return errors.Wrap(err, "making statefulset failed")
}
level.Debug(c.logger).Log("msg", "updating current Prometheus statefulset")
_, err = ssetClient.Update(sset)

5
pkg/prometheus/statefulset.go
View file

@ -86,7 +86,6 @@ var (
func makeStatefulSet(
p monitoringv1.Prometheus,
previousPodManagementPolicy appsv1.PodManagementPolicyType,
config *Config,
ruleConfigMapNames []string,
inputHash string,
@ -211,10 +210,6 @@ func makeStatefulSet(
statefulset.Spec.VolumeClaimTemplates = append(statefulset.Spec.VolumeClaimTemplates, pvcTemplate)
}
// Updates to statefulset spec for fields other than 'replicas',
// 'template', and 'updateStrategy' are forbidden.
statefulset.Spec.PodManagementPolicy = previousPodManagementPolicy
return statefulset, nil
}

32
pkg/prometheus/statefulset_test.go
View file

@ -50,7 +50,7 @@ func TestStatefulSetLabelingAndAnnotations(t *testing.T) {
Labels: labels,
Annotations: annotations,
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
require.NoError(t, err)
@ -87,7 +87,7 @@ func TestPodLabelsAnnotations(t *testing.T) {
Labels: labels,
},
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
require.NoError(t, err)
if _, ok := sset.Spec.Template.ObjectMeta.Labels["testlabel"]; !ok {
t.Fatal("Pod labes are not properly propagated")
@ -127,7 +127,7 @@ func TestStatefulSetPVC(t *testing.T) {
VolumeClaimTemplate: pvc,
},
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
require.NoError(t, err)
ssetPvc := sset.Spec.VolumeClaimTemplates[0]
@ -159,7 +159,7 @@ func TestStatefulSetEmptyDir(t *testing.T) {
EmptyDir: &emptyDir,
},
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
require.NoError(t, err)
ssetVolumes := sset.Spec.Template.Spec.Volumes
@ -257,7 +257,7 @@ func TestStatefulSetVolumeInitial(t *testing.T) {
"test-secret1",
},
},
}, "", defaultTestConfig, []string{"rules-configmap-one"}, "")
}, defaultTestConfig, []string{"rules-configmap-one"}, "")
require.NoError(t, err)
@ -283,7 +283,7 @@ func TestMemoryRequestNotAdjustedWhenLimitLarger2Gi(t *testing.T) {
},
},
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -305,7 +305,7 @@ func TestAdditionalConfigMap(t *testing.T) {
Spec: monitoringv1.PrometheusSpec{
ConfigMaps: []string{"test-cm1"},
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -341,7 +341,7 @@ func TestMemoryRequestAdjustedWhenOnlyLimitGiven(t *testing.T) {
},
},
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -363,7 +363,7 @@ func TestListenLocal(t *testing.T) {
Spec: monitoringv1.PrometheusSpec{
ListenLocal: true,
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -399,7 +399,7 @@ func TestTagAndShaAndVersion(t *testing.T) {
Tag: "my-unrelated-tag",
Version: "v2.3.2",
},
}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -417,7 +417,7 @@ func TestTagAndShaAndVersion(t *testing.T) {
Tag: "my-unrelated-tag",
Version: "v2.3.2",
},
}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -441,7 +441,7 @@ func TestThanosTagAndShaAndVersion(t *testing.T) {
Tag: &thanosTag,
},
},
}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -464,7 +464,7 @@ func TestThanosTagAndShaAndVersion(t *testing.T) {
Tag: &thanosTag,
},
},
}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -482,7 +482,7 @@ func TestThanosResourcesNotSet(t *testing.T) {
Spec: monitoringv1.PrometheusSpec{
Thanos: &monitoringv1.ThanosSpec{},
},
}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -510,7 +510,7 @@ func TestThanosResourcesSet(t *testing.T) {
Resources: expected,
},
},
}, appsv1.OrderedReadyPodManagement, defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatalf("Unexpected error while making StatefulSet: %v", err)
}
@ -539,7 +539,7 @@ func TestRetention(t *testing.T) {
Version: test.version,
Retention: test.specRetention,
},
}, "", defaultTestConfig, nil, "")
}, defaultTestConfig, nil, "")
if err != nil {
t.Fatal(err)
}