github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move pkg/api.FinanlizerOrphan into metav1

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-02-02 10:57:49 +01:00
parent 871fc426b3
commit ef8bb4e7e7
18 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/helpers.go
View File

@@ -244,7 +244,7 @@ func IsServiceIPRequested(service *Service) bool {
var standardFinalizers = sets.NewString(
string(FinalizerKubernetes),
FinalizerOrphan,
metav1.FinalizerOrphan,
)
// HasAnnotation returns a bool if passed in annotation exists

4
pkg/api/types.go
View File

@@ -2798,10 +2798,10 @@ type NamespaceSpec struct {
// FinalizerName is the name identifying a finalizer during namespace lifecycle.
type FinalizerName string
// These are internal finalizer values to Kubernetes, must be qualified name unless defined here
// These are internal finalizer values to Kubernetes, must be qualified name unless defined here or
// in metav1.
const (
FinalizerKubernetes FinalizerName = "kubernetes"
FinalizerOrphan string = "orphan"
)
// NamespaceStatus is information about the current status of a Namespace.

3
pkg/api/v1/helpers.go
View File

@@ -21,6 +21,7 @@ import (
"fmt"
"strings"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/types"
@@ -82,7 +83,7 @@ func IsServiceIPRequested(service *Service) bool {
var standardFinalizers = sets.NewString(
string(FinalizerKubernetes),
FinalizerOrphan,
metav1.FinalizerOrphan,
)
func IsStandardFinalizerName(str string) bool {

4
pkg/api/v1/types.go
View File

@@ -3220,10 +3220,10 @@ type NodeList struct {
// FinalizerName is the name identifying a finalizer during namespace lifecycle.
type FinalizerName string
// These are internal finalizer values to Kubernetes, must be qualified name unless defined here
// These are internal finalizer values to Kubernetes, must be qualified name unless defined here or
// in metav1.
const (
FinalizerKubernetes FinalizerName = "kubernetes"
FinalizerOrphan string = "orphan"
)
// NamespaceSpec describes the attributes on a Namespace.

5
pkg/controller/garbagecollector/garbagecollector.go
View File

@@ -39,7 +39,6 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/clock"
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly"
// import known versions
@@ -235,7 +234,7 @@ func shouldOrphanDependents(e *event, accessor metav1.Object) bool {
}
finalizers := accessor.GetFinalizers()
for _, finalizer := range finalizers {
if finalizer == v1.FinalizerOrphan {
if finalizer == metav1.FinalizerOrphan {
return true
}
}
@@ -280,7 +279,7 @@ func (gc *GarbageCollector) removeOrphanFinalizer(owner *node) error {
var newFinalizers []string
found := false
for _, f := range finalizers {
if f == v1.FinalizerOrphan {
if f == metav1.FinalizerOrphan {
found = true
break
} else {

1
pkg/genericapiserver/registry/generic/registry/decorated_watcher_test.go
View File

@@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/kubernetes/pkg/api"
)
func TestDecoratedWatcher(t *testing.T) {

7
pkg/genericapiserver/registry/generic/registry/store.go
View File

@@ -37,7 +37,6 @@ import (
"k8s.io/apimachinery/pkg/watch"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/storage"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/genericapiserver/registry/generic"
"k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
"k8s.io/kubernetes/pkg/registry/cachesize"
@@ -546,7 +545,7 @@ func shouldUpdateFinalizers(e *Store, accessor metav1.Object, options *metav1.De
hasOrphanFinalizer := false
finalizers := accessor.GetFinalizers()
for _, f := range finalizers {
if f == api.FinalizerOrphan {
if f == metav1.FinalizerOrphan {
shouldOrphan = true
hasOrphanFinalizer = true
break
@@ -558,13 +557,13 @@ func shouldUpdateFinalizers(e *Store, accessor metav1.Object, options *metav1.De
shouldOrphan = *options.OrphanDependents
}
if shouldOrphan && !hasOrphanFinalizer {
finalizers = append(finalizers, api.FinalizerOrphan)
finalizers = append(finalizers, metav1.FinalizerOrphan)
return true, finalizers
}
if !shouldOrphan && hasOrphanFinalizer {
var newFinalizers []string
for _, f := range finalizers {
if f == api.FinalizerOrphan {
if f == metav1.FinalizerOrphan {
continue
}
newFinalizers = append(newFinalizers, f)

36
pkg/genericapiserver/registry/generic/registry/store_test.go
View File

@@ -798,7 +798,7 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
initialGeneration := int64(1)
podWithOrphanFinalizer := func(name string) *api.Pod {
return &api.Pod{
ObjectMeta: metav1.ObjectMeta{Name: name, Finalizers: []string{"foo.com/x", api.FinalizerOrphan, "bar.com/y"}, Generation: initialGeneration},
ObjectMeta: metav1.ObjectMeta{Name: name, Finalizers: []string{"foo.com/x", metav1.FinalizerOrphan, "bar.com/y"}, Generation: initialGeneration},
Spec: api.PodSpec{NodeName: "machine"},
}
}
@@ -816,7 +816,7 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
}
podWithOnlyOrphanFinalizer := func(name string) *api.Pod {
return &api.Pod{
ObjectMeta: metav1.ObjectMeta{Name: name, Finalizers: []string{api.FinalizerOrphan}, Generation: initialGeneration},
ObjectMeta: metav1.ObjectMeta{Name: name, Finalizers: []string{metav1.FinalizerOrphan}, Generation: initialGeneration},
Spec: api.PodSpec{NodeName: "machine"},
}
}
@@ -844,28 +844,28 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
orphanOptions,
defaultDeleteStrategy,
false,
[]string{"foo.com/x", api.FinalizerOrphan, "bar.com/y"},
[]string{"foo.com/x", metav1.FinalizerOrphan, "bar.com/y"},
},
{
podWithOtherFinalizers("pod2"),
orphanOptions,
defaultDeleteStrategy,
false,
[]string{"foo.com/x", "bar.com/y", api.FinalizerOrphan},
[]string{"foo.com/x", "bar.com/y", metav1.FinalizerOrphan},
},
{
podWithNoFinalizer("pod3"),
orphanOptions,
defaultDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
{
podWithOnlyOrphanFinalizer("pod4"),
orphanOptions,
defaultDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
// cases run with DeleteOptions.OrphanDedependents=false
// these cases all have oprhanDeleteStrategy, which should be ignored
@@ -907,14 +907,14 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
nilOrphanOptions,
defaultDeleteStrategy,
false,
[]string{"foo.com/x", api.FinalizerOrphan, "bar.com/y"},
[]string{"foo.com/x", metav1.FinalizerOrphan, "bar.com/y"},
},
{
podWithOrphanFinalizer("pod10"),
nilOrphanOptions,
orphanDeleteStrategy,
false,
[]string{"foo.com/x", api.FinalizerOrphan, "bar.com/y"},
[]string{"foo.com/x", metav1.FinalizerOrphan, "bar.com/y"},
},
{
podWithOtherFinalizers("pod11"),
@@ -928,7 +928,7 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
nilOrphanOptions,
orphanDeleteStrategy,
false,
[]string{"foo.com/x", "bar.com/y", api.FinalizerOrphan},
[]string{"foo.com/x", "bar.com/y", metav1.FinalizerOrphan},
},
{
podWithNoFinalizer("pod13"),
@@ -942,21 +942,21 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
nilOrphanOptions,
orphanDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
{
podWithOnlyOrphanFinalizer("pod15"),
nilOrphanOptions,
defaultDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
{
podWithOnlyOrphanFinalizer("pod16"),
nilOrphanOptions,
orphanDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
// cases run with nil DeleteOptions should have exact same behavior.
@@ -967,14 +967,14 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
nil,
defaultDeleteStrategy,
false,
[]string{"foo.com/x", api.FinalizerOrphan, "bar.com/y"},
[]string{"foo.com/x", metav1.FinalizerOrphan, "bar.com/y"},
},
{
podWithOrphanFinalizer("pod18"),
nil,
orphanDeleteStrategy,
false,
[]string{"foo.com/x", api.FinalizerOrphan, "bar.com/y"},
[]string{"foo.com/x", metav1.FinalizerOrphan, "bar.com/y"},
},
{
podWithOtherFinalizers("pod19"),
@@ -988,7 +988,7 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
nil,
orphanDeleteStrategy,
false,
[]string{"foo.com/x", "bar.com/y", api.FinalizerOrphan},
[]string{"foo.com/x", "bar.com/y", metav1.FinalizerOrphan},
},
{
podWithNoFinalizer("pod21"),
@@ -1002,21 +1002,21 @@ func TestStoreDeleteWithOrphanDependents(t *testing.T) {
nil,
orphanDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
{
podWithOnlyOrphanFinalizer("pod23"),
nil,
defaultDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
{
podWithOnlyOrphanFinalizer("pod24"),
nil,
orphanDeleteStrategy,
false,
[]string{api.FinalizerOrphan},
[]string{metav1.FinalizerOrphan},
},
}

2
pkg/registry/core/namespace/storage/storage.go
View File

@@ -141,7 +141,7 @@ func (r *REST) Delete(ctx genericapirequest.Context, name string, options *metav
newFinalizers := []string{}
for i := range existingNamespace.ObjectMeta.Finalizers {
finalizer := existingNamespace.ObjectMeta.Finalizers[i]
if string(finalizer) != api.FinalizerOrphan {
if string(finalizer) != metav1.FinalizerOrphan {
newFinalizers = append(newFinalizers, finalizer)
}
}