github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Consistent import kubelet app package name

Browse Source
This commit is contained in:
zhengguoyong 2015-11-28 08:51:39 +08:00
parent bd7984266a
commit bff8334db9
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/genkubedocs/gen_kube_docs.go
View File

@ -25,7 +25,7 @@ import (
apiservapp "k8s.io/kubernetes/cmd/kube-apiserver/app"
cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app"
klapp "k8s.io/kubernetes/cmd/kubelet/app"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
schapp "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app"
)
@ -66,7 +66,7 @@ func main() {
cobra.GenMarkdownTree(scheduler, outDir)
case "kubelet":
// generate docs for kubelet
kubelet := klapp.NewKubeletCommand()
kubelet := kubeletapp.NewKubeletCommand()
cobra.GenMarkdownTree(kubelet, outDir)
default:
fmt.Fprintf(os.Stderr, "Module %s is not supported", module)

4
cmd/hyperkube/kubelet.go
View File

@ -17,13 +17,13 @@ limitations under the License.
package main
import (
kubelet "k8s.io/kubernetes/cmd/kubelet/app"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
)
// NewKubelet creates a new hyperkube Server object that includes the
// description and flags.
func NewKubelet() *Server {
s := kubelet.NewKubeletServer()
s := kubeletapp.NewKubeletServer()
hks := Server{
SimpleUsage: "kubelet",
Long: `The kubelet binary is responsible for maintaining a set of containers on a

4
cmd/kubelet/kubelet.go
View File

@ -25,7 +25,7 @@ import (
"os"
"runtime"
"k8s.io/kubernetes/cmd/kubelet/app"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/version/verflag"
@ -34,7 +34,7 @@ import (
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
s := app.NewKubeletServer()
s := kubeletapp.NewKubeletServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()

10
contrib/mesos/pkg/executor/service/service.go
View File

@ -27,7 +27,7 @@ import (
log "github.com/golang/glog"
bindings "github.com/mesos/mesos-go/executor"
"github.com/spf13/pflag"
"k8s.io/kubernetes/cmd/kubelet/app"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/contrib/mesos/pkg/executor"
"k8s.io/kubernetes/contrib/mesos/pkg/executor/config"
"k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
@ -43,7 +43,7 @@ import (
)
type KubeletExecutorServer struct {
*app.KubeletServer
*kubeletapp.KubeletServer
SuicideTimeout time.Duration
LaunchGracePeriod time.Duration
@ -53,7 +53,7 @@ type KubeletExecutorServer struct {
func NewKubeletExecutorServer() *KubeletExecutorServer {
k := &KubeletExecutorServer{
KubeletServer: app.NewKubeletServer(),
KubeletServer: kubeletapp.NewKubeletServer(),
SuicideTimeout: config.DefaultSuicideTimeout,
LaunchGracePeriod: config.DefaultLaunchGracePeriod,
}
@ -151,8 +151,8 @@ func (s *KubeletExecutorServer) runKubelet(
if err == nil {
// apply Messo specific settings
executorDone := make(chan struct{})
kcfg.Builder = func(kc *app.KubeletConfig) (app.KubeletBootstrap, *kconfig.PodConfig, error) {
k, pc, err := app.CreateAndInitKubelet(kc)
kcfg.Builder = func(kc *kubeletapp.KubeletConfig) (kubeletapp.KubeletBootstrap, *kconfig.PodConfig, error) {
k, pc, err := kubeletapp.CreateAndInitKubelet(kc)
if err != nil {
return k, pc, err
}

4
contrib/mesos/pkg/node/statusupdater.go
View File

@ -21,7 +21,7 @@ import (
"time"
log "github.com/golang/glog"
kubelet "k8s.io/kubernetes/cmd/kubelet/app"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/contrib/mesos/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
@ -46,7 +46,7 @@ type StatusUpdater struct {
}
func NewStatusUpdater(client *client.Client, relistPeriod time.Duration, nowFunc func() time.Time) *StatusUpdater {
kubecfg := kubelet.NewKubeletServer() // only create to get the config, this is without side-effects
kubecfg := kubeletapp.NewKubeletServer() // only create to get the config, this is without side-effects
return &StatusUpdater{
client: client,
relistPeriod: relistPeriod,

4
contrib/mesos/pkg/node/statusupdater_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
kubelet "k8s.io/kubernetes/cmd/kubelet/app"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
)
@ -47,7 +47,7 @@ func Test_nodeWithUpdatedStatus(t *testing.T) {
}
cm := app.NewCMServer()
kubecfg := kubelet.NewKubeletServer()
kubecfg := kubeletapp.NewKubeletServer()
assert.True(t, kubecfg.NodeStatusUpdateFrequency*3 < cm.NodeMonitorGracePeriod) // sanity check for defaults
n := testNode(0, api.ConditionTrue, "KubeletReady")