mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
Code Activity

fix typo kuberentes

Browse source 
Signed-off-by: yeya24 <yb532204897@gmail.com>
This commit is contained in:
yeya24 2020-01-31 22:56:18 -05:00
parent 6b8e9cb7d6
commit 3f37f9ba2f
4 changed files with 10 additions and 10 deletions

2
pkg/alertmanager/statefulset.go
View file

@ -468,7 +468,7 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
terminationGracePeriod := int64(120)
finalLabels := config.Labels.Merge(podLabels)
// PodManagementPolicy is set to Parallel to mitigate issues in kuberentes: https://github.com/kubernetes/kubernetes/issues/60164
// PodManagementPolicy is set to Parallel to mitigate issues in kubernetes: https://github.com/kubernetes/kubernetes/issues/60164
// This is also mentioned as one of limitations of StatefulSets: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#limitations
return &appsv1.StatefulSetSpec{
ServiceName: governingServiceName,

2
pkg/prometheus/statefulset.go
View file

@ -903,7 +903,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config, ruleConfigMapName
if err != nil {
return nil, errors.Wrap(err, "failed to merge containers spec")
}
// PodManagementPolicy is set to Parallel to mitigate issues in kuberentes: https://github.com/kubernetes/kubernetes/issues/60164
// PodManagementPolicy is set to Parallel to mitigate issues in kubernetes: https://github.com/kubernetes/kubernetes/issues/60164
// This is also mentioned as one of limitations of StatefulSets: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#limitations
return &appsv1.StatefulSetSpec{
ServiceName: governingServiceName,

2
pkg/thanos/operator.go
View file

@ -135,7 +135,7 @@ func New(conf prometheusoperator.Config, logger log.Logger, r prometheus.Registe
TLSConfig: conf.TLSConfig,
ConfigReloaderImage: conf.ConfigReloaderImage,
ConfigReloaderCPU: conf.ConfigReloaderCPU,
ConfigReloaderMemory: conf.ConfigReloaderImage,
ConfigReloaderMemory: conf.ConfigReloaderMemory,
ThanosDefaultBaseImage: conf.ThanosDefaultBaseImage,
Namespaces: conf.Namespaces,
Labels: conf.Labels,

14
pkg/thanos/statefulset.go
View file

@ -200,14 +200,14 @@ func makeStatefulSetSpec(tr *monitoringv1.ThanosRuler, config Config, ruleConfig
localReloadURL := &url.URL{
Scheme: "http",
Host: config.LocalHost + ":9090",
Host: config.LocalHost + ":10902",
// TODO: add web prefix
Path: path.Clean("/-/reload"),
}
var reloader v1.Container
operatorContainers := []v1.Container{}
if len(ruleConfigMapNames) != 0 {
reloader = v1.Container{
reloader := v1.Container{
Name: "rules-configmap-reloader",
Image: config.ConfigReloaderImage,
Args: []string{
@ -236,6 +236,7 @@ func makeStatefulSetSpec(tr *monitoringv1.ThanosRuler, config Config, ruleConfig
})
reloader.Args = append(reloader.Args, fmt.Sprintf("--volume-dir=%s", mountPath))
}
operatorContainers = append(operatorContainers, reloader)
}
podAnnotations := map[string]string{}
@ -309,9 +310,8 @@ func makeStatefulSetSpec(tr *monitoringv1.ThanosRuler, config Config, ruleConfig
TerminationMessagePolicy: v1.TerminationMessageFallbackToLogsOnError,
}
operatorsContainers := []v1.Container{trContainer, reloader}
// PodManagementPolicy is set to Parallel to mitigate issues in kuberentes: https://github.com/kubernetes/kubernetes/issues/60164
operatorContainers = append(operatorContainers, trContainer)
// PodManagementPolicy is set to Parallel to mitigate issues in kubernetes: https://github.com/kubernetes/kubernetes/issues/60164
// This is also mentioned as one of limitations of StatefulSets: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#limitations
return &appsv1.StatefulSetSpec{
Replicas: tr.Spec.Replicas,
@ -328,7 +328,7 @@ func makeStatefulSetSpec(tr *monitoringv1.ThanosRuler, config Config, ruleConfig
Annotations: podAnnotations,
},
Spec: v1.PodSpec{
Containers: operatorsContainers,
Containers: operatorContainers,
Volumes: trVolumes,
},
},