1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 11:48:53 +00:00
This commit is contained in:
Nir Dothan 2017-04-27 18:20:21 +03:00
parent 1d24475331
commit 88e3e919a5
2 changed files with 3 additions and 3 deletions
pkg
alertmanager
prometheus

View file

@ -62,7 +62,7 @@ func makeStatefulSet(am *v1alpha1.Alertmanager, old *v1beta1.StatefulSet, config
}
if am.Spec.ImagePullSecrets != nil && len(am.Spec.ImagePullSecrets) > 0 {
statefulset.Spec.Template.Spec.ImagePullSecrets=am.Spec.ImagePullSecrets
statefulset.Spec.Template.Spec.ImagePullSecrets = am.Spec.ImagePullSecrets
}
if vc := am.Spec.Storage; vc == nil {

View file

@ -45,7 +45,7 @@ var (
managedByOperatorLabels = map[string]string{
"managed-by": "prometheus-operator",
}
probeTimeoutSeconds int32 = 3
probeTimeoutSeconds int32 = 3
)
func makeStatefulSet(p v1alpha1.Prometheus, old *v1beta1.StatefulSet, config *Config, ruleConfigMaps []*v1.ConfigMap) (*v1beta1.StatefulSet, error) {
@ -88,7 +88,7 @@ func makeStatefulSet(p v1alpha1.Prometheus, old *v1beta1.StatefulSet, config *Co
}
if p.Spec.ImagePullSecrets != nil && len(p.Spec.ImagePullSecrets) > 0 {
statefulset.Spec.Template.Spec.ImagePullSecrets=p.Spec.ImagePullSecrets
statefulset.Spec.Template.Spec.ImagePullSecrets = p.Spec.ImagePullSecrets
}
if vc := p.Spec.Storage; vc == nil {