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

setting pvc name passed for volumename in statefulset spec

Browse source
This commit is contained in:
rmartinez3 2018-06-29 13:31:02 -05:00
parent 77b49382e2
commit cfed329eee
2 changed files with 13 additions and 2 deletions
pkg
alertmanager
statefulset.go
prometheus
statefulset.go

8
pkg/alertmanager/statefulset.go
View file

@ -323,13 +323,19 @@ func makeStatefulSetSpec(a *monitoringv1.Alertmanager, config Config) (*appsv1.S
},
},
}
volumeName := volumeName(a.Name)
if p.Spec.Storage.VolumeClaimTemplate.Name != "" {
volumeName := p.Spec.Storage.VolumeClaimTemplate.Name
}
amVolumeMounts := []v1.VolumeMount{
{
Name: "config-volume",
MountPath: alertmanagerConfDir,
},
{
Name: volumeName(a.Name),
Name: volumeName,
MountPath: alertmanagerStorageDir,
SubPath: subPathForStorage(a.Spec.Storage),
},

7
pkg/prometheus/statefulset.go
View file

@ -428,6 +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
}
promVolumeMounts := []v1.VolumeMount{
{
Name: "config-out",
@ -439,7 +444,7 @@ func makeStatefulSetSpec(p monitoringv1.Prometheus, c *Config) (*appsv1.Stateful
MountPath: "/etc/prometheus/rules",
},
{
Name: volumeName(p.Name),
Name: volumeName,
MountPath: storageDir,
SubPath: subPathForStorage(p.Spec.Storage),
},