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

Merge pull request #46403 from zhangxiaoyu-zidif/delete-redundant-para-configResyncPeriod

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 44774, 46266, 46248, 46403, 46430)

hollow-node.go:delete useless para. and import

**What this PR does / why we need it**:
hollow-node.go:delete useless para. and import

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-25 06:18:00 -07:00 committed by GitHub
commit 3150dfa9b3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubemark/hollow-node.go
View File

@ -18,7 +18,6 @@ package main
import ( import (
"fmt" "fmt"
"time"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/util/flag" "k8s.io/apiserver/pkg/util/flag"
@ -58,7 +57,6 @@ type HollowNodeConfig struct {
const ( const (
maxPods = 110 maxPods = 110
podsPerCore = 0 podsPerCore = 0
configResyncPeriod = 15 * time.Minute
) )
var knownMorphs = sets.NewString("kubelet", "proxy") var knownMorphs = sets.NewString("kubelet", "proxy")