github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move all kubernetes to posix flags

pull/6/head
Joe Beda 2015-01-13 11:22:02 -08:00
parent b9dd9c4f6c
commit dcd00c936e
16 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/e2e/e2e.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package main
import (
"flag"
"fmt"
"io/ioutil"
"os"
@ -35,6 +34,8 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -699,6 +700,7 @@ func TestPodHasServiceEnvVars(c *client.Client) bool {
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
goruntime.GOMAXPROCS(goruntime.NumCPU())
util.ReallyCrash = true

3
cmd/integration/integration.go
View File

@ -19,7 +19,6 @@ limitations under the License.
package main
import (
"flag"
"io/ioutil"
"net"
"net/http"
@ -54,6 +53,7 @@ import (
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -563,6 +563,7 @@ func runServiceTest(client *client.Client) {
type testFunc func(*client.Client)
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
runtime.GOMAXPROCS(runtime.NumCPU())
util.ReallyCrash = true

3
cmd/kube-apiserver/apiserver.go
View File

@ -20,7 +20,6 @@ package main
import (
"crypto/tls"
"flag"
"net"
"net/http"
"strconv"
@ -40,6 +39,7 @@ import (
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -124,6 +124,7 @@ func newEtcd(etcdConfigFile string, etcdServerList util.StringList) (helper tool
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
util.InitLogs()
defer util.FlushLogs()

4
cmd/kube-controller-manager/controller-manager.go
View File

@ -21,7 +21,6 @@ limitations under the License.
package main
import (
"flag"
"net"
"net/http"
"strconv"
@ -38,7 +37,9 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/service"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -74,6 +75,7 @@ func verifyMinionFlags() {
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
util.InitLogs()
defer util.FlushLogs()

4
cmd/kube-proxy/proxy.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package main
import (
"flag"
"net"
"net/http"
"strconv"
@ -32,8 +31,10 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/iptables"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -52,6 +53,7 @@ func init() {
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
util.InitLogs()
defer util.FlushLogs()

1
cmd/kubecfg/kubecfg.go
View File

@ -37,6 +37,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
"github.com/golang/glog"
"github.com/skratchdot/open-golang/open"
)

4
cmd/kubelet/kubelet.go
View File

@ -21,7 +21,6 @@ limitations under the License.
package main
import (
"flag"
"math/rand"
"net"
"time"
@ -33,7 +32,9 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/standalone"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
const defaultRootDir = "/var/lib/kubelet"
@ -89,6 +90,7 @@ func setupRunOnce() {
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
util.InitLogs()
defer util.FlushLogs()

3
cmd/kubernetes/kubernetes.go
View File

@ -21,7 +21,6 @@ limitations under the License.
package main
import (
"flag"
"fmt"
"time"
@ -33,6 +32,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -66,6 +66,7 @@ func newApiClient(addr string, port int) *client.Client {
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
util.InitLogs()
defer util.FlushLogs()

2
pkg/api/resource/quantity.go
View File

@ -18,12 +18,12 @@ package resource
import (
"errors"
"flag"
"fmt"
"math/big"
"regexp"
"strings"
flag "github.com/spf13/pflag"
"speter.net/go/exp/math/dec/inf"
)

2
pkg/api/serialization_test.go
View File

@ -19,7 +19,6 @@ package api_test
import (
"encoding/json"
"flag"
"math/rand"
"reflect"
"strconv"
@ -37,6 +36,7 @@ import (
docker "github.com/fsouza/go-dockerclient"
fuzz "github.com/google/gofuzz"
flag "github.com/spf13/pflag"
"speter.net/go/exp/math/dec/inf"
)

2
pkg/conversion/scheme_test.go
View File

@ -18,7 +18,6 @@ package conversion
import (
"encoding/json"
"flag"
"fmt"
"reflect"
"strings"
@ -28,6 +27,7 @@ import (
"github.com/ghodss/yaml"
"github.com/google/gofuzz"
flag "github.com/spf13/pflag"
)
var fuzzIters = flag.Int("fuzz_iters", 50, "How many fuzzing iterations to do.")

2
pkg/util/logs.go
View File

@ -17,11 +17,11 @@ limitations under the License.
package util
import (
"flag"
"log"
"time"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var logFlushFreq = flag.Duration("log_flush_frequency", 5*time.Second, "Maximum number of seconds between log flushes")

3
pkg/util/net_test.go
View File

@ -17,8 +17,9 @@ limitations under the License.
package util
import (
"flag"
"testing"
flag "github.com/spf13/pflag"
)
func TestIP(t *testing.T) {

13
pkg/util/plog_import.go
View File

@ -42,7 +42,13 @@ func wrapFlagValue(v flag.Value) pflag.Value {
pv := &flagValueWrapper{
inner: v,
}
pv.flagType = reflect.TypeOf(v).Elem().Name()
t := reflect.TypeOf(v)
if t.Kind() == reflect.Interface || t.Kind() == reflect.Ptr {
t = t.Elem()
}
pv.flagType = t.Name()
pv.flagType = strings.TrimSuffix(pv.flagType, "Value")
return pv
}
@ -76,3 +82,8 @@ func AddFlagSetToPFlagSet(fsIn *flag.FlagSet, fsOut *pflag.FlagSet) {
func AddAllFlagsToPFlagSet(fs *pflag.FlagSet) {
AddFlagSetToPFlagSet(flag.CommandLine, fs)
}
// Add al of the top level 'flag' package flags to the top level 'pflag' flags.
func AddAllFlagsToPFlags() {
AddFlagSetToPFlagSet(flag.CommandLine, pflag.CommandLine)
}

6
pkg/version/verflag/verflag.go
View File

@ -19,12 +19,12 @@ limitations under the License.
package verflag
import (
"flag"
"fmt"
"os"
"strconv"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version"
flag "github.com/spf13/pflag"
)
type versionValue int
@ -66,6 +66,10 @@ func (v *versionValue) String() string {
return fmt.Sprintf("%v", bool(*v == VersionTrue))
}
func (v *versionValue) Type() string {
return "version"
}
func VersionVar(p *versionValue, name string, value versionValue, usage string) {
*p = value
flag.Var(p, name, usage)

4
plugin/cmd/kube-scheduler/scheduler.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package main
import (
"flag"
"net"
"net/http"
"strconv"
@ -33,6 +32,8 @@ import (
_ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider"
"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory"
"github.com/golang/glog"
flag "github.com/spf13/pflag"
)
var (
@ -47,6 +48,7 @@ func init() {
}
func main() {
util.AddAllFlagsToPFlags()
flag.Parse()
util.InitLogs()
defer util.FlushLogs()