Merge pull request #5554 from derekwaynecarr/namespace_controller

Namespace Controller to support Namespace Termination
This commit is contained in:
Clayton Coleman
2015-03-24 12:59:00 -04:00
29 changed files with 837 additions and 28 deletions

View File

@@ -1354,4 +1354,17 @@ func init() {
// If one of the conversion functions is malformed, detect it immediately.
panic(err)
}
err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "namespaces",
func(label, value string) (string, string, error) {
switch label {
case "status.phase":
return label, value, nil
default:
return "", "", fmt.Errorf("field label not supported: %s", label)
}
})
if err != nil {
// If one of the conversion functions is malformed, detect it immediately.
panic(err)
}
}

View File

@@ -800,8 +800,17 @@ type MinionList struct {
Items []Minion `json:"items" description:"list of nodes"`
}
type FinalizerName string
// These are internal finalizer values to Kubernetes, must be qualified name unless defined here
const (
FinalizerKubernetes FinalizerName = "kubernetes"
)
// NamespaceSpec describes the attributes on a Namespace
type NamespaceSpec struct {
// Finalizers is an opaque list of values that must be empty to permanently remove object from storage
Finalizers []FinalizerName `json:"finalizers,omitempty" description:"an opaque list of values that must be empty to permanently remove object from storage"`
}
// NamespaceStatus is information about the current status of a Namespace.