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

Unify Godoc formatting, fix various typos 

Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
pull/6/head
Vojtech Vitek (V-Teq) 2014-09-02 12:00:28 +02:00
parent 7b44f88c2b
commit 59f58cd043
58 changed files with 241 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/helper.go
View File

@ -25,7 +25,7 @@ import (
) )
// codec defines methods for serializing and deserializing API // codec defines methods for serializing and deserializing API
// objects // objects.
type codec interface { type codec interface {
Encode(obj interface{}) (data []byte, err error) Encode(obj interface{}) (data []byte, err error)
Decode(data []byte) (interface{}, error) Decode(data []byte) (interface{}, error)
@ -33,7 +33,7 @@ type codec interface {
} }
// resourceVersioner provides methods for setting and retrieving // resourceVersioner provides methods for setting and retrieving
// the resource version from an API object // the resource version from an API object.
type resourceVersioner interface { type resourceVersioner interface {
SetResourceVersion(obj interface{}, version uint64) error SetResourceVersion(obj interface{}, version uint64) error
ResourceVersion(obj interface{}) (uint64, error) ResourceVersion(obj interface{}) (uint64, error)
@ -187,7 +187,7 @@ func Encode(obj interface{}) (data []byte, err error) {
return conversionScheme.Encode(obj) return conversionScheme.Encode(obj)
} }
// Ensures that obj is a pointer of some sort. Returns a reflect.Value of the // enforcePtr ensures that obj is a pointer of some sort. Returns a reflect.Value of the
// dereferenced pointer, ensuring that it is settable/addressable. // dereferenced pointer, ensuring that it is settable/addressable.
// Returns an error if this is not possible. // Returns an error if this is not possible.
func enforcePtr(obj interface{}) (reflect.Value, error) { func enforcePtr(obj interface{}) (reflect.Value, error) {

14
pkg/api/jsonbase.go
View File

@ -21,8 +21,8 @@ import (
"reflect" "reflect"
) )
// NewJSONBaseVersioner returns a resourceVersioner that can set or retrieve // NewJSONBaseResourceVersioner returns a resourceVersioner that can set or
// ResourceVersion on objects derived from JSONBase. // retrieve ResourceVersion on objects derived from JSONBase.
func NewJSONBaseResourceVersioner() resourceVersioner { func NewJSONBaseResourceVersioner() resourceVersioner {
return &jsonBaseResourceVersioner{} return &jsonBaseResourceVersioner{}
} }
@ -46,7 +46,7 @@ func (v jsonBaseResourceVersioner) SetResourceVersion(obj interface{}, version u
return nil return nil
} }
// JSONBase lets you work with a JSONBase from any of the versioned or // JSONBaseInterface lets you work with a JSONBase from any of the versioned or
// internal APIObjects. // internal APIObjects.
type JSONBaseInterface interface { type JSONBaseInterface interface {
ID() string ID() string
@ -98,9 +98,9 @@ func (g genericJSONBase) SetResourceVersion(version uint64) {
*g.resourceVersion = version *g.resourceVersion = version
} }
// fieldPtr puts the address address of fieldName, which must be a member of v, // fieldPtr puts the address of fieldName, which must be a member of v,
// into dest, which must be an address of a variable to which this field's address // into dest, which must be an address of a variable to which this field's
// can be assigned. // address can be assigned.
func fieldPtr(v reflect.Value, fieldName string, dest interface{}) error { func fieldPtr(v reflect.Value, fieldName string, dest interface{}) error {
field := v.FieldByName(fieldName) field := v.FieldByName(fieldName)
if !field.IsValid() { if !field.IsValid() {
@ -123,7 +123,7 @@ func fieldPtr(v reflect.Value, fieldName string, dest interface{}) error {
return fmt.Errorf("Couldn't assign/convert %v to %v", field.Type(), v.Type()) return fmt.Errorf("Couldn't assign/convert %v to %v", field.Type(), v.Type())
} }
// newGenericJSONBase makes a new generic JSONBase from v, which must be an // newGenericJSONBase creates a new generic JSONBase from v, which must be an
// addressable/setable reflect.Value having the same fields as api.JSONBase. // addressable/setable reflect.Value having the same fields as api.JSONBase.
// Returns an error if this isn't the case. // Returns an error if this isn't the case.
func newGenericJSONBase(v reflect.Value) (genericJSONBase, error) { func newGenericJSONBase(v reflect.Value) (genericJSONBase, error) {

34
pkg/api/types.go
View File

@ -87,14 +87,14 @@ type VolumeSource struct {
EmptyDirectory *EmptyDirectory `yaml:"emptyDir" json:"emptyDir"` EmptyDirectory *EmptyDirectory `yaml:"emptyDir" json:"emptyDir"`
} }
// Bare host directory volume. // HostDirectory represents bare host directory volume.
type HostDirectory struct { type HostDirectory struct {
Path string `yaml:"path" json:"path"` Path string `yaml:"path" json:"path"`
} }
type EmptyDirectory struct{} type EmptyDirectory struct{}
// Port represents a network port in a single container // Port represents a network port in a single container.
type Port struct { type Port struct {
// Optional: If specified, this must be a DNS_LABEL. Each named port // Optional: If specified, this must be a DNS_LABEL. Each named port
// in a pod must have a unique name. // in a pod must have a unique name.
@ -109,7 +109,7 @@ type Port struct {
HostIP string `yaml:"hostIP,omitempty" json:"hostIP,omitempty"` HostIP string `yaml:"hostIP,omitempty" json:"hostIP,omitempty"`
} }
// VolumeMount describes a mounting of a Volume within a container // VolumeMount describes a mounting of a Volume within a container.
type VolumeMount struct { type VolumeMount struct {
// Required: This must match the Name of a Volume [above]. // Required: This must match the Name of a Volume [above].
Name string `yaml:"name" json:"name"` Name string `yaml:"name" json:"name"`
@ -119,7 +119,7 @@ type VolumeMount struct {
MountPath string `yaml:"mountPath,omitempty" json:"mountPath,omitempty"` MountPath string `yaml:"mountPath,omitempty" json:"mountPath,omitempty"`
} }
// EnvVar represents an environment variable present in a Container // EnvVar represents an environment variable present in a Container.
type EnvVar struct { type EnvVar struct {
// Required: This must be a C_IDENTIFIER. // Required: This must be a C_IDENTIFIER.
Name string `yaml:"name" json:"name"` Name string `yaml:"name" json:"name"`
@ -137,7 +137,7 @@ type HTTPGetProbe struct {
Host string `yaml:"host,omitempty" json:"host,omitempty"` Host string `yaml:"host,omitempty" json:"host,omitempty"`
} }
// TCPSocketProbe describes a liveness probe based on opening a socket // TCPSocketProbe describes a liveness probe based on opening a socket.
type TCPSocketProbe struct { type TCPSocketProbe struct {
// Required: Port to connect to. // Required: Port to connect to.
Port util.IntOrString `yaml:"port,omitempty" json:"port,omitempty"` Port util.IntOrString `yaml:"port,omitempty" json:"port,omitempty"`
@ -148,7 +148,7 @@ type ExecProbe struct {
// Command is the command line to execute inside the container, the working directory for the // Command is the command line to execute inside the container, the working directory for the
// command is root ('/') in the container's filesystem. The command is simply exec'd, it is // command is root ('/') in the container's filesystem. The command is simply exec'd, it is
// not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use // not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
// a shell, you need to explicitly call out to that shell // a shell, you need to explicitly call out to that shell.
Command []string `yaml:"command,omitempty" json:"command,omitempty"` Command []string `yaml:"command,omitempty" json:"command,omitempty"`
} }
@ -187,7 +187,7 @@ type Container struct {
LivenessProbe *LivenessProbe `yaml:"livenessProbe,omitempty" json:"livenessProbe,omitempty"` LivenessProbe *LivenessProbe `yaml:"livenessProbe,omitempty" json:"livenessProbe,omitempty"`
} }
// Event is the representation of an event logged to etcd backends // Event is the representation of an event logged to etcd backends.
type Event struct { type Event struct {
Event string `json:"event,omitempty"` Event string `json:"event,omitempty"`
Manifest *ContainerManifest `json:"manifest,omitempty"` Manifest *ContainerManifest `json:"manifest,omitempty"`
@ -197,7 +197,7 @@ type Event struct {
// The below types are used by kube_client and api_server. // The below types are used by kube_client and api_server.
// JSONBase is shared by all objects sent to, or returned from the client // JSONBase is shared by all objects sent to, or returned from the client.
type JSONBase struct { type JSONBase struct {
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"` Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
ID string `json:"id,omitempty" yaml:"id,omitempty"` ID string `json:"id,omitempty" yaml:"id,omitempty"`
@ -238,7 +238,7 @@ type RestartPolicy struct {
Type RestartPolicyType `yaml:"type,omitempty" json:"type,omitempty"` Type RestartPolicyType `yaml:"type,omitempty" json:"type,omitempty"`
} }
// PodState is the state of a pod, used as either input (desired state) or output (current state) // PodState is the state of a pod, used as either input (desired state) or output (current state).
type PodState struct { type PodState struct {
Manifest ContainerManifest `json:"manifest,omitempty" yaml:"manifest,omitempty"` Manifest ContainerManifest `json:"manifest,omitempty" yaml:"manifest,omitempty"`
Status PodStatus `json:"status,omitempty" yaml:"status,omitempty"` Status PodStatus `json:"status,omitempty" yaml:"status,omitempty"`
@ -262,7 +262,7 @@ type PodList struct {
Items []Pod `json:"items" yaml:"items,omitempty"` Items []Pod `json:"items" yaml:"items,omitempty"`
} }
// Pod is a collection of containers, used as either input (create, update) or as output (list, get) // Pod is a collection of containers, used as either input (create, update) or as output (list, get).
type Pod struct { type Pod struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
@ -270,7 +270,7 @@ type Pod struct {
CurrentState PodState `json:"currentState,omitempty" yaml:"currentState,omitempty"` CurrentState PodState `json:"currentState,omitempty" yaml:"currentState,omitempty"`
} }
// ReplicationControllerState is the state of a replication controller, either input (create, update) or as output (list, get) // ReplicationControllerState is the state of a replication controller, either input (create, update) or as output (list, get).
type ReplicationControllerState struct { type ReplicationControllerState struct {
Replicas int `json:"replicas" yaml:"replicas"` Replicas int `json:"replicas" yaml:"replicas"`
ReplicaSelector map[string]string `json:"replicaSelector,omitempty" yaml:"replicaSelector,omitempty"` ReplicaSelector map[string]string `json:"replicaSelector,omitempty" yaml:"replicaSelector,omitempty"`
@ -283,20 +283,20 @@ type ReplicationControllerList struct {
Items []ReplicationController `json:"items,omitempty" yaml:"items,omitempty"` Items []ReplicationController `json:"items,omitempty" yaml:"items,omitempty"`
} }
// ReplicationController represents the configuration of a replication controller // ReplicationController represents the configuration of a replication controller.
type ReplicationController struct { type ReplicationController struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
DesiredState ReplicationControllerState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"` DesiredState ReplicationControllerState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
} }
// PodTemplate holds the information used for creating pods // PodTemplate holds the information used for creating pods.
type PodTemplate struct { type PodTemplate struct {
DesiredState PodState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"` DesiredState PodState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
} }
// ServiceList holds a list of services // ServiceList holds a list of services.
type ServiceList struct { type ServiceList struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
Items []Service `json:"items" yaml:"items"` Items []Service `json:"items" yaml:"items"`
@ -421,7 +421,7 @@ const (
// Status code 202 // Status code 202
StatusReasonWorking StatusReason = "working" StatusReasonWorking StatusReason = "working"
// ResourceTypeNotFound means one or more resources required for this operation // StatusReasonNotFound means one or more resources required for this operation
// could not be found. // could not be found.
// Details (optional): // Details (optional):
// "kind" string - the kind attribute of the missing resource // "kind" string - the kind attribute of the missing resource
@ -438,14 +438,14 @@ const (
// Status code 409 // Status code 409
StatusReasonAlreadyExists StatusReason = "already_exists" StatusReasonAlreadyExists StatusReason = "already_exists"
// ResourceTypeConflict means the requested update operation cannot be completed // StatusReasonConflict means the requested update operation cannot be completed
// due to a conflict in the operation. The client may need to alter the request. // due to a conflict in the operation. The client may need to alter the request.
// Each resource may define custom details that indicate the nature of the // Each resource may define custom details that indicate the nature of the
// conflict. // conflict.
// Status code 409 // Status code 409
StatusReasonConflict StatusReason = "conflict" StatusReasonConflict StatusReason = "conflict"
// ResourceTypeInvalid means the requested create or update operation cannot be // StatusReasonInvalid means the requested create or update operation cannot be
// completed due to invalid data provided as part of the request. The client may // completed due to invalid data provided as part of the request. The client may
// need to alter the request. When set, the client may use the StatusDetails // need to alter the request. When set, the client may use the StatusDetails
// message field as a summary of the issues encountered. // message field as a summary of the issues encountered.

2
pkg/api/v1beta1/doc.go
View File

@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package v1beta1 is the v1beta1 version of the API // Package v1beta1 is the v1beta1 version of the API.
package v1beta1 package v1beta1

34
pkg/api/v1beta1/types.go
View File

@ -87,14 +87,14 @@ type VolumeSource struct {
EmptyDirectory *EmptyDirectory `yaml:"emptyDir" json:"emptyDir"` EmptyDirectory *EmptyDirectory `yaml:"emptyDir" json:"emptyDir"`
} }
// Bare host directory volume. // HostDirectory represents bare host directory volume.
type HostDirectory struct { type HostDirectory struct {
Path string `yaml:"path" json:"path"` Path string `yaml:"path" json:"path"`
} }
type EmptyDirectory struct{} type EmptyDirectory struct{}
// Port represents a network port in a single container // Port represents a network port in a single container.
type Port struct { type Port struct {
// Optional: If specified, this must be a DNS_LABEL. Each named port // Optional: If specified, this must be a DNS_LABEL. Each named port
// in a pod must have a unique name. // in a pod must have a unique name.
@ -109,7 +109,7 @@ type Port struct {
HostIP string `yaml:"hostIP,omitempty" json:"hostIP,omitempty"` HostIP string `yaml:"hostIP,omitempty" json:"hostIP,omitempty"`
} }
// VolumeMount describes a mounting of a Volume within a container // VolumeMount describes a mounting of a Volume within a container.
type VolumeMount struct { type VolumeMount struct {
// Required: This must match the Name of a Volume [above]. // Required: This must match the Name of a Volume [above].
Name string `yaml:"name" json:"name"` Name string `yaml:"name" json:"name"`
@ -125,7 +125,7 @@ type VolumeMount struct {
MountType string `yaml:"mountType,omitempty" json:"mountType,omitempty"` MountType string `yaml:"mountType,omitempty" json:"mountType,omitempty"`
} }
// EnvVar represents an environment variable present in a Container // EnvVar represents an environment variable present in a Container.
type EnvVar struct { type EnvVar struct {
// Required: This must be a C_IDENTIFIER. // Required: This must be a C_IDENTIFIER.
// Exactly one of the following must be set. If both are set, prefer Name. // Exactly one of the following must be set. If both are set, prefer Name.
@ -146,7 +146,7 @@ type HTTPGetProbe struct {
Host string `yaml:"host,omitempty" json:"host,omitempty"` Host string `yaml:"host,omitempty" json:"host,omitempty"`
} }
// TCPSocketProbe describes a liveness probe based on opening a socket // TCPSocketProbe describes a liveness probe based on opening a socket.
type TCPSocketProbe struct { type TCPSocketProbe struct {
// Required: Port to connect to. // Required: Port to connect to.
Port util.IntOrString `yaml:"port,omitempty" json:"port,omitempty"` Port util.IntOrString `yaml:"port,omitempty" json:"port,omitempty"`
@ -197,7 +197,7 @@ type Container struct {
LivenessProbe *LivenessProbe `yaml:"livenessProbe,omitempty" json:"livenessProbe,omitempty"` LivenessProbe *LivenessProbe `yaml:"livenessProbe,omitempty" json:"livenessProbe,omitempty"`
} }
// Event is the representation of an event logged to etcd backends // Event is the representation of an event logged to etcd backends.
type Event struct { type Event struct {
Event string `json:"event,omitempty"` Event string `json:"event,omitempty"`
Manifest *ContainerManifest `json:"manifest,omitempty"` Manifest *ContainerManifest `json:"manifest,omitempty"`
@ -207,7 +207,7 @@ type Event struct {
// The below types are used by kube_client and api_server. // The below types are used by kube_client and api_server.
// JSONBase is shared by all objects sent to, or returned from the client // JSONBase is shared by all objects sent to, or returned from the client.
type JSONBase struct { type JSONBase struct {
Kind string `json:"kind,omitempty" yaml:"kind,omitempty"` Kind string `json:"kind,omitempty" yaml:"kind,omitempty"`
ID string `json:"id,omitempty" yaml:"id,omitempty"` ID string `json:"id,omitempty" yaml:"id,omitempty"`
@ -248,7 +248,7 @@ type RestartPolicy struct {
Type RestartPolicyType `yaml:"type,omitempty" json:"type,omitempty"` Type RestartPolicyType `yaml:"type,omitempty" json:"type,omitempty"`
} }
// PodState is the state of a pod, used as either input (desired state) or output (current state) // PodState is the state of a pod, used as either input (desired state) or output (current state).
type PodState struct { type PodState struct {
Manifest ContainerManifest `json:"manifest,omitempty" yaml:"manifest,omitempty"` Manifest ContainerManifest `json:"manifest,omitempty" yaml:"manifest,omitempty"`
Status PodStatus `json:"status,omitempty" yaml:"status,omitempty"` Status PodStatus `json:"status,omitempty" yaml:"status,omitempty"`
@ -272,7 +272,7 @@ type PodList struct {
Items []Pod `json:"items" yaml:"items,omitempty"` Items []Pod `json:"items" yaml:"items,omitempty"`
} }
// Pod is a collection of containers, used as either input (create, update) or as output (list, get) // Pod is a collection of containers, used as either input (create, update) or as output (list, get).
type Pod struct { type Pod struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
@ -280,7 +280,7 @@ type Pod struct {
CurrentState PodState `json:"currentState,omitempty" yaml:"currentState,omitempty"` CurrentState PodState `json:"currentState,omitempty" yaml:"currentState,omitempty"`
} }
// ReplicationControllerState is the state of a replication controller, either input (create, update) or as output (list, get) // ReplicationControllerState is the state of a replication controller, either input (create, update) or as output (list, get).
type ReplicationControllerState struct { type ReplicationControllerState struct {
Replicas int `json:"replicas" yaml:"replicas"` Replicas int `json:"replicas" yaml:"replicas"`
ReplicaSelector map[string]string `json:"replicaSelector,omitempty" yaml:"replicaSelector,omitempty"` ReplicaSelector map[string]string `json:"replicaSelector,omitempty" yaml:"replicaSelector,omitempty"`
@ -293,20 +293,20 @@ type ReplicationControllerList struct {
Items []ReplicationController `json:"items,omitempty" yaml:"items,omitempty"` Items []ReplicationController `json:"items,omitempty" yaml:"items,omitempty"`
} }
// ReplicationController represents the configuration of a replication controller // ReplicationController represents the configuration of a replication controller.
type ReplicationController struct { type ReplicationController struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
DesiredState ReplicationControllerState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"` DesiredState ReplicationControllerState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
} }
// PodTemplate holds the information used for creating pods // PodTemplate holds the information used for creating pods.
type PodTemplate struct { type PodTemplate struct {
DesiredState PodState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"` DesiredState PodState `json:"desiredState,omitempty" yaml:"desiredState,omitempty"`
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
} }
// ServiceList holds a list of services // ServiceList holds a list of services.
type ServiceList struct { type ServiceList struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
Items []Service `json:"items" yaml:"items"` Items []Service `json:"items" yaml:"items"`
@ -369,9 +369,9 @@ type Status struct {
JSONBase `json:",inline" yaml:",inline"` JSONBase `json:",inline" yaml:",inline"`
// One of: "success", "failure", "working" (for operations not yet completed) // One of: "success", "failure", "working" (for operations not yet completed)
Status string `json:"status,omitempty" yaml:"status,omitempty"` Status string `json:"status,omitempty" yaml:"status,omitempty"`
// A human readable description of the status of this operation. // A human-readable description of the status of this operation.
Message string `json:"message,omitempty" yaml:"message,omitempty"` Message string `json:"message,omitempty" yaml:"message,omitempty"`
// A machine readable description of why this operation is in the // A machine-readable description of why this operation is in the
// "failure" or "working" status. If this value is empty there // "failure" or "working" status. If this value is empty there
// is no information available. A Reason clarifies an HTTP status // is no information available. A Reason clarifies an HTTP status
// code but does not override it. // code but does not override it.
@ -434,7 +434,7 @@ const (
// Status code 202 // Status code 202
StatusReasonWorking StatusReason = "working" StatusReasonWorking StatusReason = "working"
// ResourceTypeNotFound means one or more resources required for this operation // StatusReasonNotFound means one or more resources required for this operation
// could not be found. // could not be found.
// Details (optional): // Details (optional):
// "kind" string - the kind attribute of the missing resource // "kind" string - the kind attribute of the missing resource
@ -451,7 +451,7 @@ const (
// Status code 409 // Status code 409
StatusReasonAlreadyExists StatusReason = "alreadyExists" StatusReasonAlreadyExists StatusReason = "alreadyExists"
// ResourceTypeConflict means the requested update operation cannot be completed // StatusReasonConflict means the requested update operation cannot be completed
// due to a conflict in the operation. The client may need to alter the request. // due to a conflict in the operation. The client may need to alter the request.
// Each resource may define custom details that indicate the nature of the // Each resource may define custom details that indicate the nature of the
// conflict. // conflict.

5
pkg/api/validation.go
View File

@ -172,7 +172,8 @@ func AccumulateUniquePorts(containers []Container, accumulator map[int]bool, ext
return allErrs return allErrs
} }
// Checks for colliding Port.HostPort values across a slice of containers. // checkHostPortConflicts checks for colliding Port.HostPort values across
// a slice of containers.
func checkHostPortConflicts(containers []Container) errs.ErrorList { func checkHostPortConflicts(containers []Container) errs.ErrorList {
allPorts := map[int]bool{} allPorts := map[int]bool{}
return AccumulateUniquePorts(containers, allPorts, func(p *Port) int { return p.HostPort }) return AccumulateUniquePorts(containers, allPorts, func(p *Port) int { return p.HostPort })
@ -245,7 +246,7 @@ func ValidatePodState(podState *PodState) errs.ErrorList {
return allErrs return allErrs
} }
// Pod tests if required fields in the pod are set. // ValidatePod tests if required fields in the pod are set.
func ValidatePod(pod *Pod) errs.ErrorList { func ValidatePod(pod *Pod) errs.ErrorList {
allErrs := errs.ErrorList{} allErrs := errs.ErrorList{}
if len(pod.ID) == 0 { if len(pod.ID) == 0 {

13
pkg/apiserver/apiserver.go
View File

@ -31,8 +31,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// Codec defines methods for serializing and deserializing API // Codec defines methods for serializing and deserializing API objects.
// objects.
type Codec interface { type Codec interface {
Encode(obj interface{}) (data []byte, err error) Encode(obj interface{}) (data []byte, err error)
Decode(data []byte) (interface{}, error) Decode(data []byte) (interface{}, error)
@ -117,7 +116,7 @@ func InstallSupport(mux mux) {
mux.HandleFunc("/", handleIndex) mux.HandleFunc("/", handleIndex)
} }
// RecoverPanics wraps an http Handler to recover and log panics // RecoverPanics wraps an http Handler to recover and log panics.
func RecoverPanics(handler http.Handler) http.Handler { func RecoverPanics(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
defer func() { defer func() {
@ -142,12 +141,12 @@ func RecoverPanics(handler http.Handler) http.Handler {
}) })
} }
// handleVersionReq writes the server's version information. // handleVersion writes the server's version information.
func handleVersion(w http.ResponseWriter, req *http.Request) { func handleVersion(w http.ResponseWriter, req *http.Request) {
writeRawJSON(http.StatusOK, version.Get(), w) writeRawJSON(http.StatusOK, version.Get(), w)
} }
// writeJSON renders an object as JSON to the response // writeJSON renders an object as JSON to the response.
func writeJSON(statusCode int, codec Codec, object interface{}, w http.ResponseWriter) { func writeJSON(statusCode int, codec Codec, object interface{}, w http.ResponseWriter) {
output, err := codec.Encode(object) output, err := codec.Encode(object)
if err != nil { if err != nil {
@ -159,7 +158,7 @@ func writeJSON(statusCode int, codec Codec, object interface{}, w http.ResponseW
w.Write(output) w.Write(output)
} }
// errorJSON renders an error to the response // errorJSON renders an error to the response.
func errorJSON(err error, codec Codec, w http.ResponseWriter) { func errorJSON(err error, codec Codec, w http.ResponseWriter) {
status := errToAPIStatus(err) status := errToAPIStatus(err)
writeJSON(status.Code, codec, status, w) writeJSON(status.Code, codec, status, w)
@ -193,7 +192,7 @@ func readBody(req *http.Request) ([]byte, error) {
return ioutil.ReadAll(req.Body) return ioutil.ReadAll(req.Body)
} }
// splitPath returns the segments for a URL path // splitPath returns the segments for a URL path.
func splitPath(path string) []string { func splitPath(path string) []string {
path = strings.Trim(path, "/") path = strings.Trim(path, "/")
if path == "" { if path == "" {

2
pkg/apiserver/doc.go
View File

@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package apiserver contains the code that provides a RESTful api service // Package apiserver contains the code that provides a RESTful api service.
package apiserver package apiserver

16
pkg/apiserver/errors.go
View File

@ -25,7 +25,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools" "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
) )
// apiServerError is an error intended for consumption by a REST API server // apiServerError is an error intended for consumption by a REST API server.
type apiServerError struct { type apiServerError struct {
api.Status api.Status
} }
@ -49,7 +49,7 @@ func NewNotFoundErr(kind, name string) error {
}} }}
} }
// NewAlreadyExistsErr returns an error indicating the item requested exists by that identifier // NewAlreadyExistsErr returns an error indicating the item requested exists by that identifier.
func NewAlreadyExistsErr(kind, name string) error { func NewAlreadyExistsErr(kind, name string) error {
return &apiServerError{api.Status{ return &apiServerError{api.Status{
Status: api.StatusFailure, Status: api.StatusFailure,
@ -77,7 +77,7 @@ func NewConflictErr(kind, name string, err error) error {
}} }}
} }
// NewInvalidError returns an error indicating the item is invalid and cannot be processed. // NewInvalidErr returns an error indicating the item is invalid and cannot be processed.
func NewInvalidErr(kind, name string, errs errors.ErrorList) error { func NewInvalidErr(kind, name string, errs errors.ErrorList) error {
causes := make([]api.StatusCause, 0, len(errs)) causes := make([]api.StatusCause, 0, len(errs))
for i := range errs { for i := range errs {
@ -102,7 +102,7 @@ func NewInvalidErr(kind, name string, errs errors.ErrorList) error {
}} }}
} }
// IsNotFound returns true if the specified error was created by NewNotFoundErr // IsNotFound returns true if the specified error was created by NewNotFoundErr.
func IsNotFound(err error) bool { func IsNotFound(err error) bool {
return reasonForError(err) == api.StatusReasonNotFound return reasonForError(err) == api.StatusReasonNotFound
} }
@ -112,12 +112,12 @@ func IsAlreadyExists(err error) bool {
return reasonForError(err) == api.StatusReasonAlreadyExists return reasonForError(err) == api.StatusReasonAlreadyExists
} }
// IsConflict determines if the err is an error which indicates the provided update conflicts // IsConflict determines if the err is an error which indicates the provided update conflicts.
func IsConflict(err error) bool { func IsConflict(err error) bool {
return reasonForError(err) == api.StatusReasonConflict return reasonForError(err) == api.StatusReasonConflict
} }
// IsInvalid determines if the err is an error which indicates the provided resource is not valid // IsInvalid determines if the err is an error which indicates the provided resource is not valid.
func IsInvalid(err error) bool { func IsInvalid(err error) bool {
return reasonForError(err) == api.StatusReasonInvalid return reasonForError(err) == api.StatusReasonInvalid
} }
@ -154,13 +154,13 @@ func errToAPIStatus(err error) *api.Status {
} }
} }
// notFound renders a simple not found error // notFound renders a simple not found error.
func notFound(w http.ResponseWriter, req *http.Request) { func notFound(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
fmt.Fprintf(w, "Not Found: %#v", req.RequestURI) fmt.Fprintf(w, "Not Found: %#v", req.RequestURI)
} }
// badGatewayError renders a simple bad gateway error // badGatewayError renders a simple bad gateway error.
func badGatewayError(w http.ResponseWriter, req *http.Request) { func badGatewayError(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(http.StatusBadGateway) w.WriteHeader(http.StatusBadGateway)
fmt.Fprintf(w, "Bad Gateway: %#v", req.RequestURI) fmt.Fprintf(w, "Bad Gateway: %#v", req.RequestURI)

2
pkg/apiserver/index.go
View File

@ -21,7 +21,7 @@ import (
"net/http" "net/http"
) )
// handleIndex is the root index page for Kubernetes // handleIndex is the root index page for Kubernetes.
func handleIndex(w http.ResponseWriter, req *http.Request) { func handleIndex(w http.ResponseWriter, req *http.Request) {
if req.URL.Path != "/" && req.URL.Path != "/index.html" { if req.URL.Path != "/" && req.URL.Path != "/index.html" {
notFound(w, req) notFound(w, req)

4
pkg/apiserver/interfaces.go
View File

@ -21,7 +21,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/watch" "github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
) )
// RESTStorage is a generic interface for RESTful storage services // RESTStorage is a generic interface for RESTful storage services.
// Resources which are exported to the RESTful API of apiserver need to implement this interface. // Resources which are exported to the RESTful API of apiserver need to implement this interface.
type RESTStorage interface { type RESTStorage interface {
// New returns an empty object that can be used with Create and Update after request data has been put into it. // New returns an empty object that can be used with Create and Update after request data has been put into it.
@ -56,7 +56,7 @@ type ResourceWatcher interface {
Watch(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) Watch(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error)
} }
// Redirectors know how to return a remote resource's location. // Redirector know how to return a remote resource's location.
type Redirector interface { type Redirector interface {
// ResourceLocation should return the remote location of the given resource, or an error. // ResourceLocation should return the remote location of the given resource, or an error.
ResourceLocation(id string) (remoteLocation string, err error) ResourceLocation(id string) (remoteLocation string, err error)

12
pkg/apiserver/operation.go
View File

@ -102,14 +102,14 @@ func (ops *Operations) NewOperation(from <-chan interface{}) *Operation {
return op return op
} }
// Inserts op into the ops map. // insert inserts op into the ops map.
func (ops *Operations) insert(op *Operation) { func (ops *Operations) insert(op *Operation) {
ops.lock.Lock() ops.lock.Lock()
defer ops.lock.Unlock() defer ops.lock.Unlock()
ops.ops[op.ID] = op ops.ops[op.ID] = op
} }
// List operations for an API client. // List lists operations for an API client.
func (ops *Operations) List() api.ServerOpList { func (ops *Operations) List() api.ServerOpList {
ops.lock.Lock() ops.lock.Lock()
defer ops.lock.Unlock() defer ops.lock.Unlock()
@ -126,14 +126,14 @@ func (ops *Operations) List() api.ServerOpList {
return ol return ol
} }
// Get returns the operation with the given ID, or nil // Get returns the operation with the given ID, or nil.
func (ops *Operations) Get(id string) *Operation { func (ops *Operations) Get(id string) *Operation {
ops.lock.Lock() ops.lock.Lock()
defer ops.lock.Unlock() defer ops.lock.Unlock()
return ops.ops[id] return ops.ops[id]
} }
// Garbage collect operations that have finished longer than maxAge ago. // expire garbage collect operations that have finished longer than maxAge ago.
func (ops *Operations) expire(maxAge time.Duration) { func (ops *Operations) expire(maxAge time.Duration) {
ops.lock.Lock() ops.lock.Lock()
defer ops.lock.Unlock() defer ops.lock.Unlock()
@ -147,7 +147,7 @@ func (ops *Operations) expire(maxAge time.Duration) {
ops.ops = keep ops.ops = keep
} }
// Waits forever for the operation to complete; call via go when // wait waits forever for the operation to complete; call via go when
// the operation is created. Sets op.finished when the operation // the operation is created. Sets op.finished when the operation
// does complete, and closes the notify channel, in case there // does complete, and closes the notify channel, in case there
// are any WaitFor() calls in progress. // are any WaitFor() calls in progress.
@ -173,7 +173,7 @@ func (op *Operation) WaitFor(timeout time.Duration) {
} }
} }
// Returns true if this operation finished before limitTime. // expired returns true if this operation finished before limitTime.
func (op *Operation) expired(limitTime time.Time) bool { func (op *Operation) expired(limitTime time.Time) bool {
op.lock.Lock() op.lock.Lock()
defer op.lock.Unlock() defer op.lock.Unlock()

2
pkg/apiserver/resthandler.go
View File

@ -157,7 +157,7 @@ func (h *RESTHandler) handleRESTStorage(parts []string, req *http.Request, w htt
} }
} }
// createOperation creates an operation to process a channel response // createOperation creates an operation to process a channel response.
func (h *RESTHandler) createOperation(out <-chan interface{}, sync bool, timeout time.Duration) *Operation { func (h *RESTHandler) createOperation(out <-chan interface{}, sync bool, timeout time.Duration) *Operation {
op := h.ops.NewOperation(out) op := h.ops.NewOperation(out)
if sync { if sync {

2
pkg/apiserver/watch.go
View File

@ -51,7 +51,7 @@ func getWatchParams(query url.Values) (label, field labels.Selector, resourceVer
return label, field, resourceVersion return label, field, resourceVersion
} }
// handleWatch processes a watch request // ServeHTTP processes watch requests.
func (h *WatchHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { func (h *WatchHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
parts := splitPath(req.URL.Path) parts := splitPath(req.URL.Path)
if len(parts) < 1 || req.Method != "GET" { if len(parts) < 1 || req.Method != "GET" {

2
pkg/client/cache/reflector.go vendored
View File

@ -42,7 +42,7 @@ type Reflector struct {
// WatchFactory should begin a watch at the specified version. // WatchFactory should begin a watch at the specified version.
type WatchFactory func(resourceVersion uint64) (watch.Interface, error) type WatchFactory func(resourceVersion uint64) (watch.Interface, error)
// NewReflector makes a new Reflector object which will keep the given store up to // NewReflector creates a new Reflector object which will keep the given store up to
// date with the server's contents for the given resource. Reflector promises to // date with the server's contents for the given resource. Reflector promises to
// only put things in the store that have the type of expectedType. // only put things in the store that have the type of expectedType.
func NewReflector(watchFactory WatchFactory, expectedType interface{}, store Store) *Reflector { func NewReflector(watchFactory WatchFactory, expectedType interface{}, store Store) *Reflector {

39
pkg/client/client.go
View File

@ -43,7 +43,7 @@ type Interface interface {
MinionInterface MinionInterface
} }
// PodInterface has methods to work with Pod resources // PodInterface has methods to work with Pod resources.
type PodInterface interface { type PodInterface interface {
ListPods(selector labels.Selector) (api.PodList, error) ListPods(selector labels.Selector) (api.PodList, error)
GetPod(name string) (api.Pod, error) GetPod(name string) (api.Pod, error)
@ -52,7 +52,7 @@ type PodInterface interface {
UpdatePod(api.Pod) (api.Pod, error) UpdatePod(api.Pod) (api.Pod, error)
} }
// ReplicationControllerInterface has methods to work with ReplicationController resources // ReplicationControllerInterface has methods to work with ReplicationController resources.
type ReplicationControllerInterface interface { type ReplicationControllerInterface interface {
ListReplicationControllers(selector labels.Selector) (api.ReplicationControllerList, error) ListReplicationControllers(selector labels.Selector) (api.ReplicationControllerList, error)
GetReplicationController(name string) (api.ReplicationController, error) GetReplicationController(name string) (api.ReplicationController, error)
@ -62,7 +62,7 @@ type ReplicationControllerInterface interface {
WatchReplicationControllers(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) WatchReplicationControllers(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error)
} }
// ServiceInterface has methods to work with Service resources // ServiceInterface has methods to work with Service resources.
type ServiceInterface interface { type ServiceInterface interface {
GetService(name string) (api.Service, error) GetService(name string) (api.Service, error)
CreateService(api.Service) (api.Service, error) CreateService(api.Service) (api.Service, error)
@ -73,7 +73,7 @@ type ServiceInterface interface {
WatchEndpoints(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) WatchEndpoints(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error)
} }
// VersionInterface has a method to retrieve the server version // VersionInterface has a method to retrieve the server version.
type VersionInterface interface { type VersionInterface interface {
ServerVersion() (*version.Info, error) ServerVersion() (*version.Info, error)
} }
@ -119,14 +119,14 @@ func (s *StatusErr) Error() string {
return fmt.Sprintf("Status: %v (%#v)", s.Status.Status, s.Status) return fmt.Sprintf("Status: %v (%#v)", s.Status.Status, s.Status)
} }
// AuthInfo is used to store authorization information // AuthInfo is used to store authorization information.
type AuthInfo struct { type AuthInfo struct {
User string User string
Password string Password string
} }
// RESTClient holds common code used to work with API resources that follow the // RESTClient holds common code used to work with API resources that follow the
// Kubernetes API pattern // Kubernetes API pattern.
// Host is the http://... base for the URL // Host is the http://... base for the URL
type RESTClient struct { type RESTClient struct {
host string host string
@ -168,7 +168,7 @@ func NewRESTClient(host string, auth *AuthInfo, path string) (*RESTClient, error
}, nil }, nil
} }
// normalizePrefix ensures the passed initial value is valid // normalizePrefix ensures the passed initial value is valid.
func normalizePrefix(host, prefix string) (*url.URL, error) { func normalizePrefix(host, prefix string) (*url.URL, error) {
if host == "" { if host == "" {
return nil, fmt.Errorf("host must be a URL or a host:port pair") return nil, fmt.Errorf("host must be a URL or a host:port pair")
@ -197,7 +197,8 @@ func (c *RESTClient) Secure() bool {
return c.secure return c.secure
} }
// Execute a request, adds authentication (if auth != nil), and HTTPS cert ignoring. // doRequest executes a request, adds authentication (if auth != nil), and HTTPS
// cert ignoring.
func (c *RESTClient) doRequest(request *http.Request) ([]byte, error) { func (c *RESTClient) doRequest(request *http.Request) ([]byte, error) {
if c.auth != nil { if c.auth != nil {
request.SetBasicAuth(c.auth.User, c.auth.Password) request.SetBasicAuth(c.auth.User, c.auth.Password)
@ -239,30 +240,30 @@ func (c *RESTClient) doRequest(request *http.Request) ([]byte, error) {
return body, err return body, err
} }
// ListPods takes a selector, and returns the list of pods that match that selector // ListPods takes a selector, and returns the list of pods that match that selector.
func (c *Client) ListPods(selector labels.Selector) (result api.PodList, err error) { func (c *Client) ListPods(selector labels.Selector) (result api.PodList, err error) {
err = c.Get().Path("pods").SelectorParam("labels", selector).Do().Into(&result) err = c.Get().Path("pods").SelectorParam("labels", selector).Do().Into(&result)
return return
} }
// GetPod takes the name of the pod, and returns the corresponding Pod object, and an error if it occurs // GetPod takes the name of the pod, and returns the corresponding Pod object, and an error if it occurs.
func (c *Client) GetPod(name string) (result api.Pod, err error) { func (c *Client) GetPod(name string) (result api.Pod, err error) {
err = c.Get().Path("pods").Path(name).Do().Into(&result) err = c.Get().Path("pods").Path(name).Do().Into(&result)
return return
} }
// DeletePod takes the name of the pod, and returns an error if one occurs // DeletePod takes the name of the pod, and returns an error if one occurs.
func (c *Client) DeletePod(name string) error { func (c *Client) DeletePod(name string) error {
return c.Delete().Path("pods").Path(name).Do().Error() return c.Delete().Path("pods").Path(name).Do().Error()
} }
// CreatePod takes the representation of a pod. Returns the server's representation of the pod, and an error, if it occurs // CreatePod takes the representation of a pod. Returns the server's representation of the pod, and an error, if it occurs.
func (c *Client) CreatePod(pod api.Pod) (result api.Pod, err error) { func (c *Client) CreatePod(pod api.Pod) (result api.Pod, err error) {
err = c.Post().Path("pods").Body(pod).Do().Into(&result) err = c.Post().Path("pods").Body(pod).Do().Into(&result)
return return
} }
// UpdatePod takes the representation of a pod to update. Returns the server's representation of the pod, and an error, if it occurs // UpdatePod takes the representation of a pod to update. Returns the server's representation of the pod, and an error, if it occurs.
func (c *Client) UpdatePod(pod api.Pod) (result api.Pod, err error) { func (c *Client) UpdatePod(pod api.Pod) (result api.Pod, err error) {
if pod.ResourceVersion == 0 { if pod.ResourceVersion == 0 {
err = fmt.Errorf("invalid update object, missing resource version: %v", pod) err = fmt.Errorf("invalid update object, missing resource version: %v", pod)
@ -272,25 +273,25 @@ func (c *Client) UpdatePod(pod api.Pod) (result api.Pod, err error) {
return return
} }
// ListReplicationControllers takes a selector, and returns the list of replication controllers that match that selector // ListReplicationControllers takes a selector, and returns the list of replication controllers that match that selector.
func (c *Client) ListReplicationControllers(selector labels.Selector) (result api.ReplicationControllerList, err error) { func (c *Client) ListReplicationControllers(selector labels.Selector) (result api.ReplicationControllerList, err error) {
err = c.Get().Path("replicationControllers").SelectorParam("labels", selector).Do().Into(&result) err = c.Get().Path("replicationControllers").SelectorParam("labels", selector).Do().Into(&result)
return return
} }
// GetReplicationController returns information about a particular replication controller // GetReplicationController returns information about a particular replication controller.
func (c *Client) GetReplicationController(name string) (result api.ReplicationController, err error) { func (c *Client) GetReplicationController(name string) (result api.ReplicationController, err error) {
err = c.Get().Path("replicationControllers").Path(name).Do().Into(&result) err = c.Get().Path("replicationControllers").Path(name).Do().Into(&result)
return return
} }
// CreateReplicationController creates a new replication controller // CreateReplicationController creates a new replication controller.
func (c *Client) CreateReplicationController(controller api.ReplicationController) (result api.ReplicationController, err error) { func (c *Client) CreateReplicationController(controller api.ReplicationController) (result api.ReplicationController, err error) {
err = c.Post().Path("replicationControllers").Body(controller).Do().Into(&result) err = c.Post().Path("replicationControllers").Body(controller).Do().Into(&result)
return return
} }
// UpdateReplicationController updates an existing replication controller // UpdateReplicationController updates an existing replication controller.
func (c *Client) UpdateReplicationController(controller api.ReplicationController) (result api.ReplicationController, err error) { func (c *Client) UpdateReplicationController(controller api.ReplicationController) (result api.ReplicationController, err error) {
if controller.ResourceVersion == 0 { if controller.ResourceVersion == 0 {
err = fmt.Errorf("invalid update object, missing resource version: %v", controller) err = fmt.Errorf("invalid update object, missing resource version: %v", controller)
@ -343,7 +344,7 @@ func (c *Client) DeleteService(name string) error {
return c.Delete().Path("services").Path(name).Do().Error() return c.Delete().Path("services").Path(name).Do().Error()
} }
// WatchService returns a watch.Interface that watches the requested services. // WatchServices returns a watch.Interface that watches the requested services.
func (c *Client) WatchServices(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) { func (c *Client) WatchServices(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) {
return c.Get(). return c.Get().
Path("watch"). Path("watch").
@ -379,7 +380,7 @@ func (c *Client) ServerVersion() (*version.Info, error) {
return &info, nil return &info, nil
} }
// Lists all the minions in the cluster. // ListMinions lists all the minions in the cluster.
func (c *Client) ListMinions() (minionList api.MinionList, err error) { func (c *Client) ListMinions() (minionList api.MinionList, err error) {
err = c.Get().Path("minions").Do().Into(&minionList) err = c.Get().Path("minions").Do().Into(&minionList)
return return

4
pkg/client/podinfo.go
View File

@ -28,7 +28,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
) )
// ErrPodInfoNotAvailable may be returned when the requested pod info is not available // ErrPodInfoNotAvailable may be returned when the requested pod info is not available.
var ErrPodInfoNotAvailable = errors.New("no pod info available") var ErrPodInfoNotAvailable = errors.New("no pod info available")
// PodInfoGetter is an interface for things that can get information about a pod's containers. // PodInfoGetter is an interface for things that can get information about a pod's containers.
@ -39,7 +39,7 @@ type PodInfoGetter interface {
GetPodInfo(host, podID string) (api.PodInfo, error) GetPodInfo(host, podID string) (api.PodInfo, error)
} }
// HTTPPodInfoGetter is the default implementation of PodInfoGetter, accesses the kubelet over HTTP // HTTPPodInfoGetter is the default implementation of PodInfoGetter, accesses the kubelet over HTTP.
type HTTPPodInfoGetter struct { type HTTPPodInfoGetter struct {
Client *http.Client Client *http.Client
Port uint Port uint

11
pkg/client/request.go
View File

@ -39,7 +39,7 @@ import (
// are therefore not allowed to set manually. // are therefore not allowed to set manually.
var specialParams = util.NewStringSet("sync", "timeout") var specialParams = util.NewStringSet("sync", "timeout")
// Verb begins a request with a verb (GET, POST, PUT, DELETE) // Verb begins a request with a verb (GET, POST, PUT, DELETE).
// //
// Example usage of Client's request building interface: // Example usage of Client's request building interface:
// auth, err := LoadAuth(filename) // auth, err := LoadAuth(filename)
@ -114,7 +114,7 @@ func (r *Request) Path(item string) *Request {
return r return r
} }
// Sync sets sync/async call status by setting the "sync" parameter to "true"/"false" // Sync sets sync/async call status by setting the "sync" parameter to "true"/"false".
func (r *Request) Sync(sync bool) *Request { func (r *Request) Sync(sync bool) *Request {
if r.err != nil { if r.err != nil {
return r return r
@ -245,7 +245,8 @@ func (r *Request) finalURL() string {
return finalURL return finalURL
} }
// Attempts to begin watching the requested location. Returns a watch.Interface, or an error. // Watch attempts to begin watching the requested location.
// Returns a watch.Interface, or an error.
func (r *Request) Watch() (watch.Interface, error) { func (r *Request) Watch() (watch.Interface, error) {
if r.err != nil { if r.err != nil {
return nil, r.err return nil, r.err
@ -319,7 +320,7 @@ func (r Result) Get() (interface{}, error) {
return api.Decode(r.body) return api.Decode(r.body)
} }
// Into stores the result into obj, if possible.. // Into stores the result into obj, if possible.
func (r Result) Into(obj interface{}) error { func (r Result) Into(obj interface{}) error {
if r.err != nil { if r.err != nil {
return r.err return r.err
@ -327,7 +328,7 @@ func (r Result) Into(obj interface{}) error {
return api.DecodeInto(r.body, obj) return api.DecodeInto(r.body, obj)
} }
// Returns the error executing the request, nil if no error occurred. // Error returns the error executing the request, nil if no error occurred.
func (r Result) Error() error { func (r Result) Error() error {
return r.err return r.err
} }

4
pkg/cloudprovider/cloud.go
View File

@ -20,7 +20,7 @@ import (
"net" "net"
) )
// Interface is an abstract, pluggable interface for cloud providers // Interface is an abstract, pluggable interface for cloud providers.
type Interface interface { type Interface interface {
// TCPLoadBalancer returns a balancer interface. Also returns true if the interface is supported, false otherwise. // TCPLoadBalancer returns a balancer interface. Also returns true if the interface is supported, false otherwise.
TCPLoadBalancer() (TCPLoadBalancer, bool) TCPLoadBalancer() (TCPLoadBalancer, bool)
@ -51,7 +51,7 @@ type Instances interface {
List(filter string) ([]string, error) List(filter string) ([]string, error)
} }
// Zone represents the location of a particular machine // Zone represents the location of a particular machine.
type Zone struct { type Zone struct {
FailureDomain string FailureDomain string
Region string Region string

4
pkg/cloudprovider/doc.go
View File

@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package cloudprovider supplies interfaces and implementations for cloud service providers // Package cloudprovider supplies interfaces and implementations for cloud service providers.
package cloudprovider package cloudprovider
import ()

5
pkg/cloudprovider/gce/gce.go
View File

@ -201,7 +201,7 @@ func (gce *GCECloud) IPAddress(instance string) (net.IP, error) {
return ip, nil return ip, nil
} }
// This is hacky, compute the delta between hostame and hostname -f // fqdnSuffix is hacky function to compute the delta between hostame and hostname -f.
func fqdnSuffix() (string, error) { func fqdnSuffix() (string, error) {
fullHostname, err := exec.Command("hostname", "-f").Output() fullHostname, err := exec.Command("hostname", "-f").Output()
if err != nil { if err != nil {
@ -253,7 +253,8 @@ func (gce *GCECloud) GetZone() (cloudprovider.Zone, error) {
}, nil }, nil
} }
// gce zone names are of the form: ${region-name}-${ix}. // getGceRegion returns region of the gce zone. Zone names
// are of the form: ${region-name}-${ix}.
// For example "us-central1-b" has a region of "us-central1". // For example "us-central1-b" has a region of "us-central1".
// So we look for the last '-' and trim to just before that. // So we look for the last '-' and trim to just before that.
func getGceRegion(zone string) (string, error) { func getGceRegion(zone string) (string, error) {

26
pkg/cloudprovider/vagrant/vagrant.go
View File

@ -28,7 +28,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
) )
// VagrantCloud is an implementation of Interface, TCPLoadBalancer and Instances for developer managed Vagrant cluster // VagrantCloud is an implementation of Interface, TCPLoadBalancer and Instances for developer managed Vagrant cluster.
type VagrantCloud struct { type VagrantCloud struct {
saltURL string saltURL string
saltUser string saltUser string
@ -40,26 +40,26 @@ func init() {
cloudprovider.RegisterCloudProvider("vagrant", func() (cloudprovider.Interface, error) { return newVagrantCloud() }) cloudprovider.RegisterCloudProvider("vagrant", func() (cloudprovider.Interface, error) { return newVagrantCloud() })
} }
// SaltToken is an authorization token required by Salt REST API // SaltToken is an authorization token required by Salt REST API.
type SaltToken struct { type SaltToken struct {
Token string `json:"token"` Token string `json:"token"`
User string `json:"user"` User string `json:"user"`
EAuth string `json:"eauth"` EAuth string `json:"eauth"`
} }
// SaltLoginResponse is the response object for a /login operation against Salt REST API // SaltLoginResponse is the response object for a /login operation against Salt REST API.
type SaltLoginResponse struct { type SaltLoginResponse struct {
Data []SaltToken `json:"return"` Data []SaltToken `json:"return"`
} }
// SaltMinion is a machine managed by the Salt service // SaltMinion is a machine managed by the Salt service.
type SaltMinion struct { type SaltMinion struct {
Roles []string `json:"roles"` Roles []string `json:"roles"`
IP string `json:"minion_ip"` IP string `json:"minion_ip"`
Host string `json:"host"` Host string `json:"host"`
} }
// SaltMinions is a map of minion name to machine information // SaltMinions is a map of minion name to machine information.
type SaltMinions map[string]SaltMinion type SaltMinions map[string]SaltMinion
// SaltMinionsResponse is the response object for a /minions operation against Salt REST API // SaltMinionsResponse is the response object for a /minions operation against Salt REST API
@ -77,28 +77,28 @@ func newVagrantCloud() (*VagrantCloud, error) {
}, nil }, nil
} }
// TCPLoadBalancer returns an implementation of TCPLoadBalancer for Vagrant cloud // TCPLoadBalancer returns an implementation of TCPLoadBalancer for Vagrant cloud.
func (v *VagrantCloud) TCPLoadBalancer() (cloudprovider.TCPLoadBalancer, bool) { func (v *VagrantCloud) TCPLoadBalancer() (cloudprovider.TCPLoadBalancer, bool) {
return nil, false return nil, false
} }
// Instances returns an implementation of Instances for Vagrant cloud // Instances returns an implementation of Instances for Vagrant cloud.
func (v *VagrantCloud) Instances() (cloudprovider.Instances, bool) { func (v *VagrantCloud) Instances() (cloudprovider.Instances, bool) {
return v, true return v, true
} }
// Zones returns an implementation of Zones for Vagrant cloud // Zones returns an implementation of Zones for Vagrant cloud.
func (v *VagrantCloud) Zones() (cloudprovider.Zones, bool) { func (v *VagrantCloud) Zones() (cloudprovider.Zones, bool) {
return nil, false return nil, false
} }
// IPAddress returns the address of a particular machine instance // IPAddress returns the address of a particular machine instance.
func (v *VagrantCloud) IPAddress(instance string) (net.IP, error) { func (v *VagrantCloud) IPAddress(instance string) (net.IP, error) {
// since the instance now is the IP in the vagrant env, this is trivial no-op // since the instance now is the IP in the vagrant env, this is trivial no-op
return net.ParseIP(instance), nil return net.ParseIP(instance), nil
} }
// saltMinionsByRole filters a list of minions that have a matching role // saltMinionsByRole filters a list of minions that have a matching role.
func (v *VagrantCloud) saltMinionsByRole(minions []SaltMinion, role string) []SaltMinion { func (v *VagrantCloud) saltMinionsByRole(minions []SaltMinion, role string) []SaltMinion {
var filteredMinions []SaltMinion var filteredMinions []SaltMinion
for _, value := range minions { for _, value := range minions {
@ -110,7 +110,7 @@ func (v *VagrantCloud) saltMinionsByRole(minions []SaltMinion, role string) []Sa
return filteredMinions return filteredMinions
} }
// saltMinions invokes the Salt API for minions using provided token // saltMinions invokes the Salt API for minions using provided token.
func (v *VagrantCloud) saltMinions(token SaltToken) ([]SaltMinion, error) { func (v *VagrantCloud) saltMinions(token SaltToken) ([]SaltMinion, error) {
var minions []SaltMinion var minions []SaltMinion
@ -139,7 +139,7 @@ func (v *VagrantCloud) saltMinions(token SaltToken) ([]SaltMinion, error) {
return minions, nil return minions, nil
} }
// saltLogin invokes the Salt API to get an authorization token // saltLogin invokes the Salt API to get an authorization token.
func (v *VagrantCloud) saltLogin() (SaltToken, error) { func (v *VagrantCloud) saltLogin() (SaltToken, error) {
url := v.saltURL + "/login" url := v.saltURL + "/login"
data := neturl.Values{ data := neturl.Values{
@ -172,7 +172,7 @@ func (v *VagrantCloud) saltLogin() (SaltToken, error) {
return loginResp.Data[0], nil return loginResp.Data[0], nil
} }
// List enumerates the set of minions instances known by the cloud provider // List enumerates the set of minions instances known by the cloud provider.
func (v *VagrantCloud) List(filter string) ([]string, error) { func (v *VagrantCloud) List(filter string) ([]string, error) {
token, err := v.saltLogin() token, err := v.saltLogin()
if err != nil { if err != nil {

6
pkg/conversion/converter.go
View File

@ -41,7 +41,7 @@ type Converter struct {
Debug DebugLogger Debug DebugLogger
} }
// NewConverter makes a new Converter object. // NewConverter creates a new Converter object.
func NewConverter() *Converter { func NewConverter() *Converter {
return &Converter{ return &Converter{
funcs: map[typePair]reflect.Value{}, funcs: map[typePair]reflect.Value{},
@ -83,7 +83,7 @@ func (c *Converter) Register(conversionFunc interface{}) error {
return nil return nil
} }
// FieldMatchingType contains a list of ways in which struct fields could be // FieldMatchingFlags contains a list of ways in which struct fields could be
// copied. These constants may be | combined. // copied. These constants may be | combined.
type FieldMatchingFlags int type FieldMatchingFlags int
@ -105,7 +105,7 @@ const (
AllowDifferentFieldTypeNames AllowDifferentFieldTypeNames
) )
// Returns true if the given flag or combination of flags is set. // IsSet returns true if the given flag or combination of flags is set.
func (f FieldMatchingFlags) IsSet(flag FieldMatchingFlags) bool { func (f FieldMatchingFlags) IsSet(flag FieldMatchingFlags) bool {
return f&flag == flag return f&flag == flag
} }

6
pkg/conversion/scheme.go
View File

@ -168,7 +168,7 @@ func (metaInsertion) Interpret(in interface{}) (version, kind string) {
return m.Version, m.Kind return m.Version, m.Kind
} }
// DataAPIVersionAndKind will return the APIVersion and Kind of the given wire-format // DataVersionAndKind will return the APIVersion and Kind of the given wire-format
// enconding of an API Object, or an error. // enconding of an API Object, or an error.
func (s *Scheme) DataVersionAndKind(data []byte) (version, kind string, err error) { func (s *Scheme) DataVersionAndKind(data []byte) (version, kind string, err error) {
findKind := s.MetaInsertionFactory.Create("", "") findKind := s.MetaInsertionFactory.Create("", "")
@ -217,8 +217,8 @@ func maybeCopy(obj interface{}) interface{} {
return v2.Interface() return v2.Interface()
} }
// Ensures that obj is a pointer of some sort. Returns a reflect.Value of the // enforcePtr ensures that obj is a pointer of some sort. Returns a reflect.Value
// dereferenced pointer, ensuring that it is settable/addressable. // of the dereferenced pointer, ensuring that it is settable/addressable.
// Returns an error if this is not possible. // Returns an error if this is not possible.
func enforcePtr(obj interface{}) (reflect.Value, error) { func enforcePtr(obj interface{}) (reflect.Value, error) {
v := reflect.ValueOf(obj) v := reflect.ValueOf(obj)

14
pkg/election/etcd_master.go
View File

@ -27,7 +27,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// NewEtcdMasterElector returns an implementation of election.MasterElector backed by etcd // NewEtcdMasterElector returns an implementation of election.MasterElector backed by etcd.
func NewEtcdMasterElector(h tools.EtcdGetSet) MasterElector { func NewEtcdMasterElector(h tools.EtcdGetSet) MasterElector {
return &etcdMasterElector{etcd: h} return &etcdMasterElector{etcd: h}
} }
@ -41,7 +41,7 @@ type etcdMasterElector struct {
events chan watch.Event events chan watch.Event
} }
// Elect implements the election.MasterElector interface // Elect implements the election.MasterElector interface.
func (e *etcdMasterElector) Elect(path, id string) watch.Interface { func (e *etcdMasterElector) Elect(path, id string) watch.Interface {
e.done = make(chan empty) e.done = make(chan empty)
e.events = make(chan watch.Event) e.events = make(chan watch.Event)
@ -66,12 +66,12 @@ func (e *etcdMasterElector) run(path, id string) {
} }
} }
// ResultChan implements the watch.Interface interface // ResultChan implements the watch.Interface interface.
func (e *etcdMasterElector) ResultChan() <-chan watch.Event { func (e *etcdMasterElector) ResultChan() <-chan watch.Event {
return e.events return e.events
} }
// extendMaster attempts to extend ownership of a master lock for TTL seconds // extendMaster attempts to extend ownership of a master lock for TTL seconds.
// returns "", nil if extension failed // returns "", nil if extension failed
// returns id, nil if extension succeeded // returns id, nil if extension succeeded
// returns "", err if an error occurred // returns "", err if an error occurred
@ -90,7 +90,7 @@ func (e *etcdMasterElector) extendMaster(path, id string, ttl uint64, res *etcd.
return id, nil return id, nil
} }
// becomeMaster attempts to become the master for this lock // becomeMaster attempts to become the master for this lock.
// returns "", nil if the attempt failed // returns "", nil if the attempt failed
// returns id, nil if the attempt succeeded // returns id, nil if the attempt succeeded
// returns "", err if an error occurred // returns "", err if an error occurred
@ -106,7 +106,7 @@ func (e *etcdMasterElector) becomeMaster(path, id string, ttl uint64) (string, e
return id, nil return id, nil
} }
// handleMaster performs one loop of master locking // handleMaster performs one loop of master locking.
// on success it returns <master>, nil // on success it returns <master>, nil
// on error it returns "", err // on error it returns "", err
// in situations where you should try again due to concurrent state changes (e.g. another actor simultaneously acquiring the lock) // in situations where you should try again due to concurrent state changes (e.g. another actor simultaneously acquiring the lock)
@ -138,7 +138,7 @@ func (e *etcdMasterElector) handleMaster(path, id string, ttl uint64) (string, e
return e.extendMaster(path, id, ttl, res) return e.extendMaster(path, id, ttl, res)
} }
// Master provices a distributed master election lock, maintains lock until failure, or someone sends something in the done channel // master provices a distributed master election lock, maintains lock until failure, or someone sends something in the done channel.
// The basic algorithm is: // The basic algorithm is:
// while !done // while !done
// Get the current master // Get the current master

8
pkg/health/health.go
View File

@ -42,9 +42,9 @@ type HealthChecker interface {
var checkerLock = sync.Mutex{} var checkerLock = sync.Mutex{}
var checkers = map[string]HealthChecker{} var checkers = map[string]HealthChecker{}
// Add a health checker to the list of known HealthChecker objects. Any subsequent call to // AddHealthChecker adds a health checker to the list of known HealthChecker objects.
// NewHealthChecker will know about this HealthChecker. // Any subsequent call to NewHealthChecker will know about this HealthChecker.
// panics if 'key' is already present. // Panics if 'key' is already present.
func AddHealthChecker(key string, checker HealthChecker) { func AddHealthChecker(key string, checker HealthChecker) {
checkerLock.Lock() checkerLock.Lock()
defer checkerLock.Unlock() defer checkerLock.Unlock()
@ -84,7 +84,7 @@ func (m *muxHealthChecker) HealthCheck(podFullName string, currentState api.PodS
return checker.HealthCheck(podFullName, currentState, container) return checker.HealthCheck(podFullName, currentState, container)
} }
// A helper function to look up a port in a container by name. // findPortByName is a helper function to look up a port in a container by name.
// Returns the HostPort if found, -1 if not found. // Returns the HostPort if found, -1 if not found.
func findPortByName(container api.Container, portName string) int { func findPortByName(container api.Container, portName string) int {
for _, port := range container.Ports { for _, port := range container.Ports {

6
pkg/health/http.go
View File

@ -32,7 +32,6 @@ type HTTPGetInterface interface {
Get(url string) (*http.Response, error) Get(url string) (*http.Response, error)
} }
// DoHTTPCheck checks if a GET request to the url succeeds.
// HTTPHealthChecker is an implementation of HealthChecker which checks container health by sending HTTP Get requests. // HTTPHealthChecker is an implementation of HealthChecker which checks container health by sending HTTP Get requests.
type HTTPHealthChecker struct { type HTTPHealthChecker struct {
client HTTPGetInterface client HTTPGetInterface
@ -42,7 +41,7 @@ func NewHTTPHealthChecker(client *http.Client) HealthChecker {
return &HTTPHealthChecker{client: &http.Client{}} return &HTTPHealthChecker{client: &http.Client{}}
} }
// Get the components of the target URL. For testability. // getURLParts parses the components of the target URL. For testability.
func getURLParts(currentState api.PodState, container api.Container) (string, int, string, error) { func getURLParts(currentState api.PodState, container api.Container) (string, int, string, error) {
params := container.LivenessProbe.HTTPGet params := container.LivenessProbe.HTTPGet
if params == nil { if params == nil {
@ -75,11 +74,12 @@ func getURLParts(currentState api.PodState, container api.Container) (string, in
return host, port, params.Path, nil return host, port, params.Path, nil
} }
// Formats a URL from args. For testability. // formatURL formats a URL from args. For testability.
func formatURL(host string, port int, path string) string { func formatURL(host string, port int, path string) string {
return fmt.Sprintf("http://%s:%d%s", host, port, path) return fmt.Sprintf("http://%s:%d%s", host, port, path)
} }
// DoHTTPCheck checks if a GET request to the url succeeds.
// If the HTTP response code is successful (i.e. 400 > code >= 200), it returns Healthy. // If the HTTP response code is successful (i.e. 400 > code >= 200), it returns Healthy.
// If the HTTP response code is unsuccessful, it returns Unhealthy. // If the HTTP response code is unsuccessful, it returns Unhealthy.
// It returns Unknown and err if the HTTP communication itself fails. // It returns Unknown and err if the HTTP communication itself fails.

2
pkg/health/tcp.go
View File

@ -28,7 +28,7 @@ import (
type TCPHealthChecker struct{} type TCPHealthChecker struct{}
// Get the components of a TCP connection address. For testability. // getTCPAddrParts parses the components of a TCP connection address. For testability.
func getTCPAddrParts(currentState api.PodState, container api.Container) (string, int, error) { func getTCPAddrParts(currentState api.PodState, container api.Container) (string, int, error) {
params := container.LivenessProbe.TCPSocket params := container.LivenessProbe.TCPSocket
if params == nil { if params == nil {

12
pkg/httplog/log.go
View File

@ -37,7 +37,7 @@ func Handler(delegate http.Handler, pred StacktracePred) http.Handler {
}) })
} }
// StacktracePred returns true if a stacktrace should be logged for this status // StacktracePred returns true if a stacktrace should be logged for this status.
type StacktracePred func(httpStatus int) (logStacktrace bool) type StacktracePred func(httpStatus int) (logStacktrace bool)
// Add a layer on top of ResponseWriter, so we can track latency and error // Add a layer on top of ResponseWriter, so we can track latency and error
@ -103,7 +103,7 @@ func Unlogged(w http.ResponseWriter) http.ResponseWriter {
return w return w
} }
// Sets the stacktrace logging predicate, which decides when to log a stacktrace. // StacktraceWhen sets the stacktrace logging predicate, which decides when to log a stacktrace.
// There's a default, so you don't need to call this unless you don't like the default. // There's a default, so you don't need to call this unless you don't like the default.
func (rl *respLogger) StacktraceWhen(pred StacktracePred) *respLogger { func (rl *respLogger) StacktraceWhen(pred StacktracePred) *respLogger {
rl.logStacktracePred = pred rl.logStacktracePred = pred
@ -123,7 +123,7 @@ func StatusIsNot(statuses ...int) StacktracePred {
} }
} }
// Add additional data to be logged with this request. // Addf adds additional data to be logged with this request.
func (rl *respLogger) Addf(format string, data ...interface{}) { func (rl *respLogger) Addf(format string, data ...interface{}) {
rl.addedInfo += "\n" + fmt.Sprintf(format, data...) rl.addedInfo += "\n" + fmt.Sprintf(format, data...)
} }
@ -134,17 +134,17 @@ func (rl *respLogger) Log() {
glog.Infof("%s %s: (%v) %v%v%v", rl.req.Method, rl.req.RequestURI, latency, rl.status, rl.statusStack, rl.addedInfo) glog.Infof("%s %s: (%v) %v%v%v", rl.req.Method, rl.req.RequestURI, latency, rl.status, rl.statusStack, rl.addedInfo)
} }
// Implement http.ResponseWriter // Header implements http.ResponseWriter.
func (rl *respLogger) Header() http.Header { func (rl *respLogger) Header() http.Header {
return rl.w.Header() return rl.w.Header()
} }
// Implement http.ResponseWriter // Write implements http.ResponseWriter.
func (rl *respLogger) Write(b []byte) (int, error) { func (rl *respLogger) Write(b []byte) (int, error) {
return rl.w.Write(b) return rl.w.Write(b)
} }
// Implement http.ResponseWriter // WriteHeader implements http.ResponseWriter.
func (rl *respLogger) WriteHeader(status int) { func (rl *respLogger) WriteHeader(status int) {
rl.status = status rl.status = status
if rl.logStacktracePred(status) { if rl.logStacktracePred(status) {

8
pkg/kubecfg/kubecfg.go
View File

@ -111,12 +111,12 @@ func Update(name string, client client.Interface, updatePeriod time.Duration) er
}) })
} }
// StopController stops a controller named 'name' by setting replicas to zero // StopController stops a controller named 'name' by setting replicas to zero.
func StopController(name string, client client.Interface) error { func StopController(name string, client client.Interface) error {
return ResizeController(name, 0, client) return ResizeController(name, 0, client)
} }
// ResizeController resizes a controller named 'name' by setting replicas to 'replicas' // ResizeController resizes a controller named 'name' by setting replicas to 'replicas'.
func ResizeController(name string, replicas int, client client.Interface) error { func ResizeController(name string, replicas int, client client.Interface) error {
controller, err := client.GetReplicationController(name) controller, err := client.GetReplicationController(name)
if err != nil { if err != nil {
@ -159,7 +159,7 @@ func portsFromString(spec string) []api.Port {
return result return result
} }
// RunController creates a new replication controller named 'name' which creates 'replicas' pods running 'image' // RunController creates a new replication controller named 'name' which creates 'replicas' pods running 'image'.
func RunController(image, name string, replicas int, client client.Interface, portSpec string, servicePort int) error { func RunController(image, name string, replicas int, client client.Interface, portSpec string, servicePort int) error {
controller := api.ReplicationController{ controller := api.ReplicationController{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
@ -233,7 +233,7 @@ func createService(name string, port int, client client.Interface) (api.Service,
} }
// DeleteController deletes a replication controller named 'name', requires that the controller // DeleteController deletes a replication controller named 'name', requires that the controller
// already be stopped // already be stopped.
func DeleteController(name string, client client.Interface) error { func DeleteController(name string, client client.Interface) error {
controller, err := client.GetReplicationController(name) controller, err := client.GetReplicationController(name)
if err != nil { if err != nil {

16
pkg/kubecfg/resource_printer.go
View File

@ -31,14 +31,14 @@ import (
"gopkg.in/v1/yaml" "gopkg.in/v1/yaml"
) )
// ResourcePrinter is an interface that knows how to print API resources // ResourcePrinter is an interface that knows how to print API resources.
type ResourcePrinter interface { type ResourcePrinter interface {
// Print receives an arbitrary JSON body, formats it and prints it to a writer // Print receives an arbitrary JSON body, formats it and prints it to a writer.
Print([]byte, io.Writer) error Print([]byte, io.Writer) error
PrintObj(interface{}, io.Writer) error PrintObj(interface{}, io.Writer) error
} }
// IdentityPrinter is an implementation of ResourcePrinter which simply copies the body out to the output stream // IdentityPrinter is an implementation of ResourcePrinter which simply copies the body out to the output stream.
type IdentityPrinter struct{} type IdentityPrinter struct{}
// Print is an implementation of ResourcePrinter.Print which simply writes the data to the Writer. // Print is an implementation of ResourcePrinter.Print which simply writes the data to the Writer.
@ -56,7 +56,7 @@ func (i *IdentityPrinter) PrintObj(obj interface{}, output io.Writer) error {
return i.Print(data, output) return i.Print(data, output)
} }
// YAMLPrinter is an implementation of ResourcePrinter which parsess JSON, and re-formats as YAML // YAMLPrinter is an implementation of ResourcePrinter which parsess JSON, and re-formats as YAML.
type YAMLPrinter struct{} type YAMLPrinter struct{}
// Print parses the data as JSON, re-formats as YAML and prints the YAML. // Print parses the data as JSON, re-formats as YAML and prints the YAML.
@ -93,15 +93,15 @@ type HumanReadablePrinter struct {
handlerMap map[reflect.Type]*handlerEntry handlerMap map[reflect.Type]*handlerEntry
} }
// NewHumanReadablePrinter creates a HumanReadablePrinter // NewHumanReadablePrinter creates a HumanReadablePrinter.
func NewHumanReadablePrinter() *HumanReadablePrinter { func NewHumanReadablePrinter() *HumanReadablePrinter {
printer := &HumanReadablePrinter{make(map[reflect.Type]*handlerEntry)} printer := &HumanReadablePrinter{make(map[reflect.Type]*handlerEntry)}
printer.addDefaultHandlers() printer.addDefaultHandlers()
return printer return printer
} }
// Handler adds a print handler with a given set of columns to HumanReadablePrinter instance // Handler adds a print handler with a given set of columns to HumanReadablePrinter instance.
// printFunc is the function that will be called to print an object // printFunc is the function that will be called to print an object.
// It must be of the following type: // It must be of the following type:
// func printFunc(object ObjectType, w io.Writer) error // func printFunc(object ObjectType, w io.Writer) error
// where ObjectType is the type of the object that will be printed. // where ObjectType is the type of the object that will be printed.
@ -142,7 +142,7 @@ var serviceColumns = []string{"Name", "Labels", "Selector", "Port"}
var minionColumns = []string{"Minion identifier"} var minionColumns = []string{"Minion identifier"}
var statusColumns = []string{"Status"} var statusColumns = []string{"Status"}
// handleDefaultTypes adds print handlers for default Kubernetes types // addDefaultHandlers adds print handlers for default Kubernetes types.
func (h *HumanReadablePrinter) addDefaultHandlers() { func (h *HumanReadablePrinter) addDefaultHandlers() {
h.Handler(podColumns, printPod) h.Handler(podColumns, printPod)
h.Handler(podColumns, printPodList) h.Handler(podColumns, printPodList)

10
pkg/kubelet/config/config.go
View File

@ -28,17 +28,17 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// PodConfigNotificationMode describes how changes are sent to the update channel // PodConfigNotificationMode describes how changes are sent to the update channel.
type PodConfigNotificationMode int type PodConfigNotificationMode int
const ( const (
// PodConfigNotificationSnapshot delivers the full configuration as a SET whenever // PodConfigNotificationSnapshot delivers the full configuration as a SET whenever
// any change occurs // any change occurs.
PodConfigNotificationSnapshot = iota PodConfigNotificationSnapshot = iota
// PodConfigNotificationSetsAndUpdates delivers an UPDATE message whenever pods are // PodConfigNotificationSnapshotAndUpdates delivers an UPDATE message whenever pods are
// changed, and a SET message if there are any additions or removals. // changed, and a SET message if there are any additions or removals.
PodConfigNotificationSnapshotAndUpdates PodConfigNotificationSnapshotAndUpdates
// PodConfigNotificationIncremental delivers ADD, UPDATE, and REMOVE to the update channel // PodConfigNotificationIncremental delivers ADD, UPDATE, and REMOVE to the update channel.
PodConfigNotificationIncremental PodConfigNotificationIncremental
) )
@ -267,7 +267,7 @@ func filterInvalidPods(pods []kubelet.Pod, source string) (filtered []*kubelet.P
return return
} }
// Sync sends a copy of the current state through the update channel // Sync sends a copy of the current state through the update channel.
func (s *podStorage) Sync() { func (s *podStorage) Sync() {
s.updateLock.Lock() s.updateLock.Lock()
defer s.updateLock.Unlock() defer s.updateLock.Unlock()

9
pkg/kubelet/config/etcd.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Reads the pod configuration from etcd using the Kubernetes etcd schema // Reads the pod configuration from etcd using the Kubernetes etcd schema.
package config package config
import ( import (
@ -46,7 +46,7 @@ type SourceEtcd struct {
timeout time.Duration timeout time.Duration
} }
// NewSourceEtcd creates a config source that watches and pulls from a key in etcd // NewSourceEtcd creates a config source that watches and pulls from a key in etcd.
func NewSourceEtcd(key string, client tools.EtcdClient, updates chan<- interface{}) *SourceEtcd { func NewSourceEtcd(key string, client tools.EtcdClient, updates chan<- interface{}) *SourceEtcd {
config := &SourceEtcd{ config := &SourceEtcd{
key: key, key: key,
@ -60,7 +60,7 @@ func NewSourceEtcd(key string, client tools.EtcdClient, updates chan<- interface
return config return config
} }
// run loops forever looking for changes to a key in etcd // run loops forever looking for changes to a key in etcd.
func (s *SourceEtcd) run() { func (s *SourceEtcd) run() {
index := uint64(0) index := uint64(0)
for { for {
@ -76,7 +76,7 @@ func (s *SourceEtcd) run() {
} }
// fetchNextState fetches the key (or waits for a change to a key) and then returns // fetchNextState fetches the key (or waits for a change to a key) and then returns
// the nextIndex to read. It will watch no longer than s.waitDuration and then return // the nextIndex to read. It will watch no longer than s.waitDuration and then return.
func (s *SourceEtcd) fetchNextState(fromIndex uint64) (nextIndex uint64, err error) { func (s *SourceEtcd) fetchNextState(fromIndex uint64) (nextIndex uint64, err error) {
var response *etcd.Response var response *etcd.Response
@ -142,5 +142,4 @@ func stopChannel(until time.Duration) chan bool {
close(stop) close(stop)
}() }()
return stop return stop
} }

2
pkg/kubelet/config/file.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Reads the pod configuration from file or a directory of files // Reads the pod configuration from file or a directory of files.
package config package config
import ( import (

2
pkg/kubelet/config/http.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Reads the pod configuration from an HTTP GET response // Reads the pod configuration from an HTTP GET response.
package config package config
import ( import (

26
pkg/kubelet/server.go
View File

@ -45,7 +45,7 @@ type Server struct {
mux *http.ServeMux mux *http.ServeMux
} }
// ListenAndServeKubeletServer initializes a server to respond to HTTP network requests on the Kubelet // ListenAndServeKubeletServer initializes a server to respond to HTTP network requests on the Kubelet.
func ListenAndServeKubeletServer(host HostInterface, updates chan<- interface{}, address string, port uint) { func ListenAndServeKubeletServer(host HostInterface, updates chan<- interface{}, address string, port uint) {
glog.Infof("Starting to listen on %s:%d", address, port) glog.Infof("Starting to listen on %s:%d", address, port)
handler := NewServer(host, updates) handler := NewServer(host, updates)
@ -70,7 +70,7 @@ type HostInterface interface {
ServeLogs(w http.ResponseWriter, req *http.Request) ServeLogs(w http.ResponseWriter, req *http.Request)
} }
// NewServer initializes and configures a kubelet.Server object to handle HTTP requests // NewServer initializes and configures a kubelet.Server object to handle HTTP requests.
func NewServer(host HostInterface, updates chan<- interface{}) Server { func NewServer(host HostInterface, updates chan<- interface{}) Server {
server := Server{ server := Server{
host: host, host: host,
@ -81,7 +81,7 @@ func NewServer(host HostInterface, updates chan<- interface{}) Server {
return server return server
} }
// InstallDefaultHandlers registers the set of supported HTTP request patterns with the mux // InstallDefaultHandlers registers the set of supported HTTP request patterns with the mux.
func (s *Server) InstallDefaultHandlers() { func (s *Server) InstallDefaultHandlers() {
healthz.InstallHandler(s.mux) healthz.InstallHandler(s.mux)
s.mux.HandleFunc("/container", s.handleContainer) s.mux.HandleFunc("/container", s.handleContainer)
@ -93,12 +93,12 @@ func (s *Server) InstallDefaultHandlers() {
s.mux.HandleFunc("/run/", s.handleRun) s.mux.HandleFunc("/run/", s.handleRun)
} }
// error serializes an error object into an HTTP response // error serializes an error object into an HTTP response.
func (s *Server) error(w http.ResponseWriter, err error) { func (s *Server) error(w http.ResponseWriter, err error) {
http.Error(w, fmt.Sprintf("Internal Error: %v", err), http.StatusInternalServerError) http.Error(w, fmt.Sprintf("Internal Error: %v", err), http.StatusInternalServerError)
} }
// handleContainer handles container requests against the Kubelet // handleContainer handles container requests against the Kubelet.
func (s *Server) handleContainer(w http.ResponseWriter, req *http.Request) { func (s *Server) handleContainer(w http.ResponseWriter, req *http.Request) {
defer req.Body.Close() defer req.Body.Close()
data, err := ioutil.ReadAll(req.Body) data, err := ioutil.ReadAll(req.Body)
@ -119,7 +119,7 @@ func (s *Server) handleContainer(w http.ResponseWriter, req *http.Request) {
} }
// handleContainers handles containers requests against the Kubelet // handleContainers handles containers requests against the Kubelet.
func (s *Server) handleContainers(w http.ResponseWriter, req *http.Request) { func (s *Server) handleContainers(w http.ResponseWriter, req *http.Request) {
defer req.Body.Close() defer req.Body.Close()
data, err := ioutil.ReadAll(req.Body) data, err := ioutil.ReadAll(req.Body)
@ -142,7 +142,7 @@ func (s *Server) handleContainers(w http.ResponseWriter, req *http.Request) {
} }
// handlePodInfo handles podInfo requests against the Kubelet // handlePodInfo handles podInfo requests against the Kubelet.
func (s *Server) handlePodInfo(w http.ResponseWriter, req *http.Request) { func (s *Server) handlePodInfo(w http.ResponseWriter, req *http.Request) {
u, err := url.ParseRequestURI(req.RequestURI) u, err := url.ParseRequestURI(req.RequestURI)
if err != nil { if err != nil {
@ -176,17 +176,17 @@ func (s *Server) handlePodInfo(w http.ResponseWriter, req *http.Request) {
w.Write(data) w.Write(data)
} }
// handleStats handles stats requests against the Kubelet // handleStats handles stats requests against the Kubelet.
func (s *Server) handleStats(w http.ResponseWriter, req *http.Request) { func (s *Server) handleStats(w http.ResponseWriter, req *http.Request) {
s.serveStats(w, req) s.serveStats(w, req)
} }
// handleLogs handles logs requests against the Kubelet // handleLogs handles logs requests against the Kubelet.
func (s *Server) handleLogs(w http.ResponseWriter, req *http.Request) { func (s *Server) handleLogs(w http.ResponseWriter, req *http.Request) {
s.host.ServeLogs(w, req) s.host.ServeLogs(w, req)
} }
// handleSpec handles spec requests against the Kubelet // handleSpec handles spec requests against the Kubelet.
func (s *Server) handleSpec(w http.ResponseWriter, req *http.Request) { func (s *Server) handleSpec(w http.ResponseWriter, req *http.Request) {
info, err := s.host.GetMachineInfo() info, err := s.host.GetMachineInfo()
if err != nil { if err != nil {
@ -203,7 +203,7 @@ func (s *Server) handleSpec(w http.ResponseWriter, req *http.Request) {
} }
// handleRun handles requests to run a command inside a container // handleRun handles requests to run a command inside a container.
func (s *Server) handleRun(w http.ResponseWriter, req *http.Request) { func (s *Server) handleRun(w http.ResponseWriter, req *http.Request) {
u, err := url.ParseRequestURI(req.RequestURI) u, err := url.ParseRequestURI(req.RequestURI)
if err != nil { if err != nil {
@ -228,7 +228,7 @@ func (s *Server) handleRun(w http.ResponseWriter, req *http.Request) {
w.Write(data) w.Write(data)
} }
// ServeHTTP responds to HTTP requests on the Kubelet // ServeHTTP responds to HTTP requests on the Kubelet.
func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) { func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
defer httplog.NewLogged(req, &w).StacktraceWhen( defer httplog.NewLogged(req, &w).StacktraceWhen(
httplog.StatusIsNot( httplog.StatusIsNot(
@ -239,7 +239,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
s.mux.ServeHTTP(w, req) s.mux.ServeHTTP(w, req)
} }
// serveStats implements stats logic // serveStats implements stats logic.
func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) { func (s *Server) serveStats(w http.ResponseWriter, req *http.Request) {
// /stats/<podfullname>/<containerName> // /stats/<podfullname>/<containerName>
components := strings.Split(strings.TrimPrefix(path.Clean(req.URL.Path), "/"), "/") components := strings.Split(strings.TrimPrefix(path.Clean(req.URL.Path), "/"), "/")

2
pkg/master/master.go
View File

@ -130,7 +130,7 @@ func (m *Master) init(cloud cloudprovider.Interface, podInfoGetter client.PodInf
} }
} }
// API_v1beta1 returns the resources and codec for API version v1beta1 // API_v1beta1 returns the resources and codec for API version v1beta1.
func (m *Master) API_v1beta1() (map[string]apiserver.RESTStorage, apiserver.Codec) { func (m *Master) API_v1beta1() (map[string]apiserver.RESTStorage, apiserver.Codec) {
storage := make(map[string]apiserver.RESTStorage) storage := make(map[string]apiserver.RESTStorage)
for k, v := range m.storage { for k, v := range m.storage {

2
pkg/master/pod_cache.go
View File

@ -46,7 +46,7 @@ func NewPodCache(info client.PodInfoGetter, pods pod.Registry) *PodCache {
} }
} }
// GetPodInfo Implements the PodInfoGetter.GetPodInfo. // GetPodInfo implements the PodInfoGetter.GetPodInfo.
// The returned value should be treated as read-only. // The returned value should be treated as read-only.
// TODO: Remove the host from this call, it's totally unnecessary. // TODO: Remove the host from this call, it's totally unnecessary.
func (p *PodCache) GetPodInfo(host, podID string) (api.PodInfo, error) { func (p *PodCache) GetPodInfo(host, podID string) (api.PodInfo, error) {

12
pkg/proxy/config/api.go
View File

@ -27,7 +27,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// Watcher is the interface needed to receive changes to services and endpoints // Watcher is the interface needed to receive changes to services and endpoints.
type Watcher interface { type Watcher interface {
WatchServices(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) WatchServices(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error)
WatchEndpoints(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) WatchEndpoints(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error)
@ -44,7 +44,7 @@ type SourceAPI struct {
reconnectDuration time.Duration reconnectDuration time.Duration
} }
// NewSourceAPI creates a config source that watches for changes to the services and endpoints // NewSourceAPI creates a config source that watches for changes to the services and endpoints.
func NewSourceAPI(client Watcher, period time.Duration, services chan<- ServiceUpdate, endpoints chan<- EndpointsUpdate) *SourceAPI { func NewSourceAPI(client Watcher, period time.Duration, services chan<- ServiceUpdate, endpoints chan<- EndpointsUpdate) *SourceAPI {
config := &SourceAPI{ config := &SourceAPI{
client: client, client: client,
@ -68,7 +68,7 @@ func NewSourceAPI(client Watcher, period time.Duration, services chan<- ServiceU
return config return config
} }
// runServices loops forever looking for changes to services // runServices loops forever looking for changes to services.
func (s *SourceAPI) runServices(resourceVersion *uint64) { func (s *SourceAPI) runServices(resourceVersion *uint64) {
watcher, err := s.client.WatchServices(labels.Everything(), labels.Everything(), *resourceVersion) watcher, err := s.client.WatchServices(labels.Everything(), labels.Everything(), *resourceVersion)
if err != nil { if err != nil {
@ -82,7 +82,7 @@ func (s *SourceAPI) runServices(resourceVersion *uint64) {
handleServicesWatch(resourceVersion, ch, s.services) handleServicesWatch(resourceVersion, ch, s.services)
} }
// handleServicesWatch loops over an event channel and delivers config changes to an update channel // handleServicesWatch loops over an event channel and delivers config changes to an update channel.
func handleServicesWatch(resourceVersion *uint64, ch <-chan watch.Event, updates chan<- ServiceUpdate) { func handleServicesWatch(resourceVersion *uint64, ch <-chan watch.Event, updates chan<- ServiceUpdate) {
for { for {
select { select {
@ -106,7 +106,7 @@ func handleServicesWatch(resourceVersion *uint64, ch <-chan watch.Event, updates
} }
} }
// runEndpoints loops forever looking for changes to endpoints // runEndpoints loops forever looking for changes to endpoints.
func (s *SourceAPI) runEndpoints(resourceVersion *uint64) { func (s *SourceAPI) runEndpoints(resourceVersion *uint64) {
watcher, err := s.client.WatchEndpoints(labels.Everything(), labels.Everything(), *resourceVersion) watcher, err := s.client.WatchEndpoints(labels.Everything(), labels.Everything(), *resourceVersion)
if err != nil { if err != nil {
@ -120,7 +120,7 @@ func (s *SourceAPI) runEndpoints(resourceVersion *uint64) {
handleEndpointsWatch(resourceVersion, ch, s.endpoints) handleEndpointsWatch(resourceVersion, ch, s.endpoints)
} }
// handleEndpointsWatch loops over an event channel and delivers config changes to an update channel // handleEndpointsWatch loops over an event channel and delivers config changes to an update channel.
func handleEndpointsWatch(resourceVersion *uint64, ch <-chan watch.Event, updates chan<- EndpointsUpdate) { func handleEndpointsWatch(resourceVersion *uint64, ch <-chan watch.Event, updates chan<- EndpointsUpdate) {
for { for {
select { select {

4
pkg/proxy/config/config.go
View File

@ -77,8 +77,8 @@ type EndpointsConfig struct {
store *endpointsStore store *endpointsStore
} }
// NewEndpointConfig creates a new EndpointConfig. // NewEndpointsConfig creates a new EndpointsConfig.
// It immediately runs the created EndpointConfig. // It immediately runs the created EndpointsConfig.
func NewEndpointsConfig() *EndpointsConfig { func NewEndpointsConfig() *EndpointsConfig {
updates := make(chan struct{}) updates := make(chan struct{})
store := &endpointsStore{updates: updates, endpoints: make(map[string]map[string]api.Endpoints)} store := &endpointsStore{updates: updates, endpoints: make(map[string]map[string]api.Endpoints)}

2
pkg/proxy/loadbalancer.go
View File

@ -20,7 +20,7 @@ import (
"net" "net"
) )
// A LoadBalancer distributes incoming requests to service endpoints. // LoadBalancer is an interface for distributing incoming requests to service endpoints.
type LoadBalancer interface { type LoadBalancer interface {
// NextEndpoint returns the endpoint to handle a request for the given // NextEndpoint returns the endpoint to handle a request for the given
// service and source address. // service and source address.

2
pkg/registry/binding/storage.go
View File

@ -31,7 +31,7 @@ type BindingStorage struct {
registry Registry registry Registry
} }
// NewBindingStorage makes a new BindingStorage backed by the given bindingRegistry. // NewBindingStorage creates a new BindingStorage backed by the given bindingRegistry.
func NewBindingStorage(bindingRegistry Registry) *BindingStorage { func NewBindingStorage(bindingRegistry Registry) *BindingStorage {
return &BindingStorage{ return &BindingStorage{
registry: bindingRegistry, registry: bindingRegistry,

12
pkg/registry/endpoint/storage.go
View File

@ -37,12 +37,12 @@ func NewStorage(registry Registry) apiserver.RESTStorage {
} }
} }
// Get satisfies the RESTStorage interface but is unimplemented // Get satisfies the RESTStorage interface but is unimplemented.
func (rs *Storage) Get(id string) (interface{}, error) { func (rs *Storage) Get(id string) (interface{}, error) {
return rs.registry.GetEndpoints(id) return rs.registry.GetEndpoints(id)
} }
// List satisfies the RESTStorage interface but is unimplemented // List satisfies the RESTStorage interface but is unimplemented.
func (rs *Storage) List(selector labels.Selector) (interface{}, error) { func (rs *Storage) List(selector labels.Selector) (interface{}, error) {
return nil, errors.New("unimplemented") return nil, errors.New("unimplemented")
} }
@ -53,22 +53,22 @@ func (rs *Storage) Watch(label, field labels.Selector, resourceVersion uint64) (
return rs.registry.WatchEndpoints(label, field, resourceVersion) return rs.registry.WatchEndpoints(label, field, resourceVersion)
} }
// Create satisfies the RESTStorage interface but is unimplemented // Create satisfies the RESTStorage interface but is unimplemented.
func (rs *Storage) Create(obj interface{}) (<-chan interface{}, error) { func (rs *Storage) Create(obj interface{}) (<-chan interface{}, error) {
return nil, errors.New("unimplemented") return nil, errors.New("unimplemented")
} }
// Update satisfies the RESTStorage interface but is unimplemented // Update satisfies the RESTStorage interface but is unimplemented.
func (rs *Storage) Update(obj interface{}) (<-chan interface{}, error) { func (rs *Storage) Update(obj interface{}) (<-chan interface{}, error) {
return nil, errors.New("unimplemented") return nil, errors.New("unimplemented")
} }
// Delete satisfies the RESTStorage interface but is unimplemented // Delete satisfies the RESTStorage interface but is unimplemented.
func (rs *Storage) Delete(id string) (<-chan interface{}, error) { func (rs *Storage) Delete(id string) (<-chan interface{}, error) {
return nil, errors.New("unimplemented") return nil, errors.New("unimplemented")
} }
// New implements the RESTStorage interface // New implements the RESTStorage interface.
func (rs Storage) New() interface{} { func (rs Storage) New() interface{} {
return &api.Endpoints{} return &api.Endpoints{}
} }

4
pkg/registry/minion/minion.go
View File

@ -26,7 +26,7 @@ import (
var ErrDoesNotExist = fmt.Errorf("The requested resource does not exist.") var ErrDoesNotExist = fmt.Errorf("The requested resource does not exist.")
// Keep track of a set of minions. Safe for concurrent reading/writing. // Registry keeps track of a set of minions. Safe for concurrent reading/writing.
type Registry interface { type Registry interface {
List() (currentMinions []string, err error) List() (currentMinions []string, err error)
Insert(minion string) error Insert(minion string) error
@ -34,7 +34,7 @@ type Registry interface {
Contains(minion string) (bool, error) Contains(minion string) (bool, error)
} }
// Initialize a minion registry with a list of minions. // NewRegistry initializes a minion registry with a list of minions.
func NewRegistry(minions []string) Registry { func NewRegistry(minions []string) Registry {
m := &minionList{ m := &minionList{
minions: util.StringSet{}, minions: util.StringSet{},

2
pkg/registry/pod/storage.go
View File

@ -34,7 +34,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// RegistryStorage implements the RESTStorage interface in terms of a PodRegistry // RegistryStorage implements the RESTStorage interface in terms of a PodRegistry.
type RegistryStorage struct { type RegistryStorage struct {
cloudProvider cloudprovider.Interface cloudProvider cloudprovider.Interface
mu sync.Mutex mu sync.Mutex

4
pkg/scheduler/listers.go
View File

@ -29,12 +29,12 @@ type MinionLister interface {
// FakeMinionLister implements MinionLister on a []string for test purposes. // FakeMinionLister implements MinionLister on a []string for test purposes.
type FakeMinionLister []string type FakeMinionLister []string
// List returns minions as a []string // List returns minions as a []string.
func (f FakeMinionLister) List() ([]string, error) { func (f FakeMinionLister) List() ([]string, error) {
return []string(f), nil return []string(f), nil
} }
// PodLister interface represents anything that can list pods for a scheduler // PodLister interface represents anything that can list pods for a scheduler.
type PodLister interface { type PodLister interface {
// TODO: make this exactly the same as client's ListPods() method... // TODO: make this exactly the same as client's ListPods() method...
ListPods(labels.Selector) ([]api.Pod, error) ListPods(labels.Selector) ([]api.Pod, error)

2
pkg/service/endpoints_controller.go
View File

@ -30,7 +30,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
) )
// A EndpointController manages service endpoints. // EndpointController manages service endpoints.
type EndpointController struct { type EndpointController struct {
client *client.Client client *client.Client
serviceRegistry service.Registry serviceRegistry service.Registry

2
pkg/tools/decoder.go
View File

@ -32,7 +32,7 @@ type APIEventDecoder struct {
decoder *json.Decoder decoder *json.Decoder
} }
// NewAPIEventDecoder makes an APIEventDecoder for the given stream. // NewAPIEventDecoder creates an APIEventDecoder for the given stream.
func NewAPIEventDecoder(stream io.ReadCloser) *APIEventDecoder { func NewAPIEventDecoder(stream io.ReadCloser) *APIEventDecoder {
return &APIEventDecoder{ return &APIEventDecoder{
stream: stream, stream: stream,

12
pkg/tools/etcd_tools.go
View File

@ -38,14 +38,14 @@ var (
EtcdErrorValueRequired = &etcd.EtcdError{ErrorCode: EtcdErrorCodeValueRequired} EtcdErrorValueRequired = &etcd.EtcdError{ErrorCode: EtcdErrorCodeValueRequired}
) )
// Codec provides methods for transforming Etcd values into objects and back // Codec provides methods for transforming Etcd values into objects and back.
type Codec interface { type Codec interface {
Encode(obj interface{}) (data []byte, err error) Encode(obj interface{}) (data []byte, err error)
Decode(data []byte) (interface{}, error) Decode(data []byte) (interface{}, error)
DecodeInto(data []byte, obj interface{}) error DecodeInto(data []byte, obj interface{}) error
} }
// ResourceVersioner provides methods for managing object modification tracking // ResourceVersioner provides methods for managing object modification tracking.
type ResourceVersioner interface { type ResourceVersioner interface {
SetResourceVersion(obj interface{}, version uint64) error SetResourceVersion(obj interface{}, version uint64) error
ResourceVersion(obj interface{}) (uint64, error) ResourceVersion(obj interface{}) (uint64, error)
@ -64,7 +64,7 @@ type EtcdClient interface {
Watch(prefix string, waitIndex uint64, recursive bool, receiver chan *etcd.Response, stop chan bool) (*etcd.Response, error) Watch(prefix string, waitIndex uint64, recursive bool, receiver chan *etcd.Response, stop chan bool) (*etcd.Response, error)
} }
// Interface exposing only the etcd operations needed by EtcdHelper. // EtcdGetSet interface exposes only the etcd operations needed by EtcdHelper.
type EtcdGetSet interface { type EtcdGetSet interface {
Get(key string, sort, recursive bool) (*etcd.Response, error) Get(key string, sort, recursive bool) (*etcd.Response, error)
Set(key, value string, ttl uint64) (*etcd.Response, error) Set(key, value string, ttl uint64) (*etcd.Response, error)
@ -134,7 +134,7 @@ func (h *EtcdHelper) listEtcdNode(key string) ([]*etcd.Node, uint64, error) {
return result.Node.Nodes, result.EtcdIndex, nil return result.Node.Nodes, result.EtcdIndex, nil
} }
// Extract a go object per etcd node into a slice with the resource version. // ExtractList extracts a go object per etcd node into a slice with the resource version.
func (h *EtcdHelper) ExtractList(key string, slicePtr interface{}, resourceVersion *uint64) error { func (h *EtcdHelper) ExtractList(key string, slicePtr interface{}, resourceVersion *uint64) error {
nodes, index, err := h.listEtcdNode(key) nodes, index, err := h.listEtcdNode(key)
if resourceVersion != nil { if resourceVersion != nil {
@ -197,7 +197,7 @@ func (h *EtcdHelper) bodyAndExtractObj(key string, objPtr interface{}, ignoreNot
return body, response.Node.ModifiedIndex, err return body, response.Node.ModifiedIndex, err
} }
// Create adds a new object at a key unless it already exists // CreateObj adds a new object at a key unless it already exists.
func (h *EtcdHelper) CreateObj(key string, obj interface{}) error { func (h *EtcdHelper) CreateObj(key string, obj interface{}) error {
data, err := h.Codec.Encode(obj) data, err := h.Codec.Encode(obj)
if err != nil { if err != nil {
@ -213,7 +213,7 @@ func (h *EtcdHelper) CreateObj(key string, obj interface{}) error {
return err return err
} }
// Delete removes the specified key // Delete removes the specified key.
func (h *EtcdHelper) Delete(key string, recursive bool) error { func (h *EtcdHelper) Delete(key string, recursive bool) error {
_, err := h.Client.Delete(key, recursive) _, err := h.Client.Delete(key, recursive)
return err return err

4
pkg/tools/etcd_tools_watch.go
View File

@ -71,7 +71,7 @@ func (h *EtcdHelper) WatchAndTransform(key string, resourceVersion uint64, trans
return w, nil return w, nil
} }
// TransformFunc attempts to convert an object to another object for use with a watcher // TransformFunc attempts to convert an object to another object for use with a watcher.
type TransformFunc func(interface{}) (interface{}, error) type TransformFunc func(interface{}) (interface{}, error)
// etcdWatcher converts a native etcd watch to a watch.Interface. // etcdWatcher converts a native etcd watch to a watch.Interface.
@ -333,7 +333,7 @@ func (w *etcdWatcher) sendResult(res *etcd.Response) {
} }
} }
// ResultChannel implements watch.Interface. // ResultChan implements watch.Interface.
func (w *etcdWatcher) ResultChan() <-chan watch.Event { func (w *etcdWatcher) ResultChan() <-chan watch.Event {
return w.outgoing return w.outgoing
} }

10
pkg/util/config/config.go
View File

@ -91,7 +91,7 @@ type Accessor interface {
MergedState() interface{} MergedState() interface{}
} }
// AccessorFunc implements the Accessor interface // AccessorFunc implements the Accessor interface.
type AccessorFunc func() interface{} type AccessorFunc func() interface{}
func (f AccessorFunc) MergedState() interface{} { func (f AccessorFunc) MergedState() interface{} {
@ -116,20 +116,20 @@ type Watcher struct {
listeners []Listener listeners []Listener
} }
// Register a set of listeners that support the Listener interface and // NewWatcher registers a set of listeners that support the Listener interface
// notify them on changes. // and notify them on changes.
func NewWatcher() *Watcher { func NewWatcher() *Watcher {
return &Watcher{} return &Watcher{}
} }
// Register Listener to receive updates of changes. // Add registers listener to receive updates of changes.
func (m *Watcher) Add(listener Listener) { func (m *Watcher) Add(listener Listener) {
m.listenerLock.Lock() m.listenerLock.Lock()
defer m.listenerLock.Unlock() defer m.listenerLock.Unlock()
m.listeners = append(m.listeners, listener) m.listeners = append(m.listeners, listener)
} }
// Notify all listeners // Notify notifies all listeners.
func (m *Watcher) Notify(instance interface{}) { func (m *Watcher) Notify(instance interface{}) {
m.listenerLock.RLock() m.listenerLock.RLock()
listeners := m.listeners listeners := m.listeners

2
pkg/util/fake_handler.go
View File

@ -24,7 +24,7 @@ import (
) )
// TestInterface is a simple interface providing Errorf, to make injection for // TestInterface is a simple interface providing Errorf, to make injection for
// testing easier (insert 'yo dawg' meme here) // testing easier (insert 'yo dawg' meme here).
type TestInterface interface { type TestInterface interface {
Errorf(format string, args ...interface{}) Errorf(format string, args ...interface{})
} }

2
pkg/util/util.go
View File

@ -88,7 +88,7 @@ func NewIntOrStringFromInt(val int) IntOrString {
return IntOrString{Kind: IntstrInt, IntVal: val} return IntOrString{Kind: IntstrInt, IntVal: val}
} }
// NewIntOrStringFromInt creates an IntOrString object with a string value. // NewIntOrStringFromString creates an IntOrString object with a string value.
func NewIntOrStringFromString(val string) IntOrString { func NewIntOrStringFromString(val string) IntOrString {
return IntOrString{Kind: IntstrString, StrVal: val} return IntOrString{Kind: IntstrString, StrVal: val}
} }

22
pkg/volume/volume.go
View File

@ -29,13 +29,13 @@ import (
var ErrUnsupportedVolumeType = errors.New("unsupported volume type") var ErrUnsupportedVolumeType = errors.New("unsupported volume type")
// Interface is a directory used by pods or hosts. // Interface is a directory used by pods or hosts.
// All method implementations of methods in the volume interface must be idempotent // All method implementations of methods in the volume interface must be idempotent.
type Interface interface { type Interface interface {
// GetPath returns the directory path the volume is mounted to. // GetPath returns the directory path the volume is mounted to.
GetPath() string GetPath() string
} }
// The Builder interface provides the method to set up/mount the volume. // Builder interface provides method to set up/mount the volume.
type Builder interface { type Builder interface {
// Uses Interface to provide the path for Docker binds. // Uses Interface to provide the path for Docker binds.
Interface Interface
@ -43,7 +43,7 @@ type Builder interface {
SetUp() error SetUp() error
} }
// The Cleaner interface provides the method to cleanup/unmount the volumes. // Cleaner interface provides method to cleanup/unmount the volumes.
type Cleaner interface { type Cleaner interface {
// TearDown unmounts the volume and removes traces of the SetUp procedure. // TearDown unmounts the volume and removes traces of the SetUp procedure.
TearDown() error TearDown() error
@ -55,8 +55,8 @@ type HostDirectory struct {
Path string Path string
} }
// Host directory mounts require no setup or cleanup, but still // SetUp implements interface definitions, even though host directory
// need to fulfill the interface definitions. // mounts don't require any setup or cleanup.
func (hostVol *HostDirectory) SetUp() error { func (hostVol *HostDirectory) SetUp() error {
return nil return nil
} }
@ -73,7 +73,7 @@ type EmptyDirectory struct {
RootDir string RootDir string
} }
// SetUp creates the new directory. // SetUp creates new directory.
func (emptyDir *EmptyDirectory) SetUp() error { func (emptyDir *EmptyDirectory) SetUp() error {
path := emptyDir.GetPath() path := emptyDir.GetPath()
err := os.MkdirAll(path, 0750) err := os.MkdirAll(path, 0750)
@ -100,7 +100,7 @@ func (emptyDir *EmptyDirectory) renameDirectory() (string, error) {
return newPath, nil return newPath, nil
} }
// Simply delete everything in the directory. // TearDown simply deletes everything in the directory.
func (emptyDir *EmptyDirectory) TearDown() error { func (emptyDir *EmptyDirectory) TearDown() error {
tmpDir, err := emptyDir.renameDirectory() tmpDir, err := emptyDir.renameDirectory()
if err != nil { if err != nil {
@ -113,12 +113,12 @@ func (emptyDir *EmptyDirectory) TearDown() error {
return nil return nil
} }
// Interprets API volume as a HostDirectory // createHostDirectory interprets API volume as a HostDirectory.
func createHostDirectory(volume *api.Volume) *HostDirectory { func createHostDirectory(volume *api.Volume) *HostDirectory {
return &HostDirectory{volume.Source.HostDirectory.Path} return &HostDirectory{volume.Source.HostDirectory.Path}
} }
// Interprets API volume as an EmptyDirectory // createEmptyDirectory interprets API volume as an EmptyDirectory.
func createEmptyDirectory(volume *api.Volume, podID string, rootDir string) *EmptyDirectory { func createEmptyDirectory(volume *api.Volume, podID string, rootDir string) *EmptyDirectory {
return &EmptyDirectory{volume.Name, podID, rootDir} return &EmptyDirectory{volume.Name, podID, rootDir}
} }
@ -155,8 +155,8 @@ func CreateVolumeCleaner(kind string, name string, podID string, rootDir string)
} }
} }
// Examines directory structure to determine volumes that are presently // GetCurrentVolumes examines directory structure to determine volumes that are
// active and mounted. Returns a map of Cleaner types. // presently active and mounted. Returns a map of Cleaner types.
func GetCurrentVolumes(rootDirectory string) map[string]Cleaner { func GetCurrentVolumes(rootDirectory string) map[string]Cleaner {
currentVolumes := make(map[string]Cleaner) currentVolumes := make(map[string]Cleaner)
mountPath := rootDirectory mountPath := rootDirectory

2
pkg/watch/filter.go
View File

@ -16,8 +16,6 @@ limitations under the License.
package watch package watch
import ()
// FilterFunc should take an event, possibly modify it in some way, and return // FilterFunc should take an event, possibly modify it in some way, and return
// the modified event. If the event should be ignored, then return keep=false. // the modified event. If the event should be ignored, then return keep=false.
type FilterFunc func(in Event) (out Event, keep bool) type FilterFunc func(in Event) (out Event, keep bool)

2
pkg/watch/iowatcher.go
View File

@ -73,7 +73,7 @@ func (sw *StreamWatcher) Stop() {
} }
} }
// In a loop, read a result from the decoder and send down the result channel. // receive reads result from the decoder in a loop and sends down the result channel.
func (sw *StreamWatcher) receive() { func (sw *StreamWatcher) receive() {
defer close(sw.result) defer close(sw.result)
defer sw.Stop() defer sw.Stop()

4
plugin/pkg/scheduler/factory/factory.go
View File

@ -181,7 +181,7 @@ type minionEnumerator struct {
*api.MinionList *api.MinionList
} }
// Returns the number of items in the pod list. // Len returns the number of items in the pod list.
func (me *minionEnumerator) Len() int { func (me *minionEnumerator) Len() int {
if me.MinionList == nil { if me.MinionList == nil {
return 0 return 0
@ -189,7 +189,7 @@ func (me *minionEnumerator) Len() int {
return len(me.Items) return len(me.Items)
} }
// Returns the item (and ID) with the particular index. // Get returns the item (and ID) with the particular index.
func (me *minionEnumerator) Get(index int) (string, interface{}) { func (me *minionEnumerator) Get(index int) (string, interface{}) {
return me.Items[index].ID, &me.Items[index] return me.Items[index].ID, &me.Items[index]
} }