kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upup: apply gofmt

This commit is contained in:
Justin Santa Barbara 2016-06-11 21:35:25 -04:00
parent 226f0284b1
commit 55574ec3f5
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upup/pkg/fi/ca.go
View File

@ -134,7 +134,6 @@ func (k *PrivateKey) UnmarshalJSON(b []byte) (err error) {
return nil
}
return fmt.Errorf("unknown format for private key: %q", string(b))
}

2
upup/pkg/fi/cloudup/terraform/target.go
View File

@ -3,13 +3,13 @@ package terraform
import (
"encoding/json"
"fmt"
"github.com/golang/glog"
hcl_parser "github.com/hashicorp/hcl/json/parser"
"io/ioutil"
"k8s.io/kube-deploy/upup/pkg/fi"
"os"
"path"
"strings"
"github.com/golang/glog"
)
type TerraformTarget struct {

26
upup/pkg/fi/nodeup/config.go
View File

@ -6,17 +6,17 @@ import "k8s.io/kube-deploy/upup/pkg/fi"
// Wherever possible, we try to use the types & names in https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/componentconfig/types.go
type NodeConfig struct {
Kubelet *KubeletConfig`json:",omitempty"`
KubeProxy *KubeProxyConfig`json:",omitempty"`
KubeControllerManager *KubeControllerManagerConfig`json:",omitempty"`
KubeScheduler *KubeSchedulerConfig`json:",omitempty"`
Docker *DockerConfig`json:",omitempty"`
APIServer *APIServerConfig`json:",omitempty"`
CACertificate *fi.Certificate`json:",omitempty"`
Kubelet *KubeletConfig `json:",omitempty"`
KubeProxy *KubeProxyConfig `json:",omitempty"`
KubeControllerManager *KubeControllerManagerConfig `json:",omitempty"`
KubeScheduler *KubeSchedulerConfig `json:",omitempty"`
Docker *DockerConfig `json:",omitempty"`
APIServer *APIServerConfig `json:",omitempty"`
CACertificate *fi.Certificate `json:",omitempty"`
DNS *DNSConfig `json:",omitempty"`
KubeUser string `json:",omitempty"`
KubePassword string `json:",omitempty"`
KubeUser string `json:",omitempty"`
KubePassword string `json:",omitempty"`
Tokens map[string]string `json:",omitempty"`
@ -35,7 +35,7 @@ func (n *NodeConfig) GetToken(key string) string {
}
type DNSConfig struct {
Replicas int `json:",omitempty"`
Replicas int `json:",omitempty"`
Domain string `json:",omitempty"`
ServerIP string `json:",omitempty"`
}
@ -322,9 +322,9 @@ type KubeletConfig struct {
type KubeProxyConfig struct {
Image string `json:",omitempty"`
// TODO: Better type ?
CPURequest string `json:",omitempty"`// e.g. "20m"
CPURequest string `json:",omitempty"` // e.g. "20m"
LogLevel int `json:",omitempty" flag:"v"`
LogLevel int `json:",omitempty" flag:"v"`
// Configuration flags - a subset of https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/componentconfig/types.go
@ -389,7 +389,7 @@ type APIServerConfig struct {
PathSrvSshproxy string `json:",omitempty"`
Image string `json:",omitempty"`
Certificate *fi.Certificate `json:",omitempty" flag:"-"`
Certificate *fi.Certificate `json:",omitempty" flag:"-"`
Key *fi.PrivateKey `json:",omitempty" flag:"-"`
LogLevel int `json:",omitempty" flag:"v"`