Skip to content

Commit

Permalink
Disable registry liveness probe to support v1 & v2
Browse files Browse the repository at this point in the history
Disable the liveness probe created by 'osadm registry --create' as it
isn't compatible with the old v1 registry.

Fixes bug 1216288
  • Loading branch information
Andy Goldstein committed Apr 29, 2015
1 parent 2bbf3ac commit ac147fa
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions pkg/cmd/experimental/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
kclientcmd "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
"github.com/spf13/cobra"

Expand Down Expand Up @@ -199,16 +198,19 @@ func NewCmdRegistry(f *clientcmd.Factory, parentName, name string, out io.Writer
},
},
Privileged: mountHost,
LivenessProbe: &kapi.Probe{
InitialDelaySeconds: 3,
TimeoutSeconds: 5,
Handler: kapi.Handler{
HTTPGet: &kapi.HTTPGetAction{
Path: "/healthz",
Port: util.NewIntOrStringFromInt(5000),
// TODO reenable the liveness probe when we no longer support the v1 registry.
/*
LivenessProbe: &kapi.Probe{
InitialDelaySeconds: 3,
TimeoutSeconds: 5,
Handler: kapi.Handler{
HTTPGet: &kapi.HTTPGetAction{
Path: "/healthz",
Port: util.NewIntOrStringFromInt(5000),
},
},
},
},
*/
},
},
Volumes: []kapi.Volume{
Expand Down

0 comments on commit ac147fa

Please sign in to comment.