Merge branch 'rook:master' into patch-1
This commit is contained in:
1 file changed
+1
-14
@@ -33,7 +33,6 @@ import (
|
||||
apps "k8s.io/api/apps/v1"
|
||||
v1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -186,7 +185,7 @@ func (c *Cluster) makeMgrDaemonContainer(mgrConfig *mgrConfig) v1.Container {
|
||||
),
|
||||
Resources: cephv1.GetMgrResources(c.spec.Resources),
|
||||
SecurityContext: controller.PodSecurityContext(),
|
||||
LivenessProbe: getDefaultMgrLivenessProbe(),
|
||||
LivenessProbe: controller.GenerateLivenessProbeExecDaemon(config.MgrType, mgrConfig.DaemonID),
|
||||
WorkingDir: config.VarLogCephDir,
|
||||
}
|
||||
|
||||
@@ -254,18 +253,6 @@ func (c *Cluster) makeCmdProxySidecarContainer(mgrConfig *mgrConfig) v1.Containe
|
||||
return container
|
||||
}
|
||||
|
||||
func getDefaultMgrLivenessProbe() *v1.Probe {
|
||||
return &v1.Probe{
|
||||
Handler: v1.Handler{
|
||||
HTTPGet: &v1.HTTPGetAction{
|
||||
Path: "/",
|
||||
Port: intstr.FromInt(int(DefaultMetricsPort)),
|
||||
},
|
||||
},
|
||||
InitialDelaySeconds: 60,
|
||||
}
|
||||
}
|
||||
|
||||
// MakeMetricsService generates the Kubernetes service object for the monitoring service
|
||||
func (c *Cluster) MakeMetricsService(name, activeDaemon, servicePortMetricName string) (*v1.Service, error) {
|
||||
labels := c.selectorLabels(activeDaemon)
|
||||
|
||||
Reference in new issue
Block a user