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

check if store pvc template is set, change volname variable

Browse source
This commit is contained in:
rmartinez3 2018-07-02 10:29:13 -05:00
parent 3e3f97fcd6
commit e9dd5dbdeb
2 changed files with 12 additions and 8 deletions
pkg
alertmanager
statefulset.go
prometheus
statefulset.go

10
pkg/alertmanager/statefulset.go
View file

@ -324,9 +324,11 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
},
}
volumeName := volumeName(a.Name)
if a.Spec.Storage.VolumeClaimTemplate.Name != "" {
volumeName = a.Spec.Storage.VolumeClaimTemplate.Name
volName := volumeName(a.Name)
if a.Spec.Storage != nil {
if a.Spec.Storage.VolumeClaimTemplate.Name != "" {
volName = a.Spec.Storage.VolumeClaimTemplate.Name
}
}
amVolumeMounts := []v1.VolumeMount{
@ -335,7 +337,7 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
MountPath: alertmanagerConfDir,
},
{
Name: volumeName,
Name: volName,
MountPath: alertmanagerStorageDir,
SubPath: subPathForStorage(a.Spec.Storage),
},

10
pkg/prometheus/statefulset.go
View file

@ -428,9 +428,11 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config) (*appsv1.Stateful
},
}
volumeName := volumeName(p.Name)
if p.Spec.Storage.VolumeClaimTemplate.Name != "" {
volumeName = p.Spec.Storage.VolumeClaimTemplate.Name
volName := volumeName(p.Name)
if p.Spec.Storage != nil {
if p.Spec.Storage.VolumeClaimTemplate.Name != "" {
volName = p.Spec.Storage.VolumeClaimTemplate.Name
}
}
promVolumeMounts := []v1.VolumeMount{
@ -444,7 +446,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config) (*appsv1.Stateful
MountPath: "/etc/prometheus/rules",
},
{
Name: volumeName,
Name: volName,
MountPath: storageDir,
SubPath: subPathForStorage(p.Spec.Storage),
},