Skip to content

Commit 6ed2024

Browse files
author
OpenShift Bot
authored
Merge pull request #14988 from deads2k/gc-07-strategy
Merged by openshift-bot
2 parents 3cc73c6 + fc868f4 commit 6ed2024

File tree

18 files changed

+143
-65
lines changed

18 files changed

+143
-65
lines changed

‎pkg/authorization/registry/rolebindingrestriction/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
"k8s.io/apiserver/pkg/storage"
1213
"k8s.io/apiserver/pkg/storage/names"
1314
kapi "k8s.io/kubernetes/pkg/api"
@@ -23,6 +24,10 @@ type strategy struct {
2324

2425
var Strategy = strategy{kapi.Scheme, names.SimpleNameGenerator}
2526

27+
func (strategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
28+
return rest.Unsupported
29+
}
30+
2631
func (strategy) NamespaceScoped() bool {
2732
return true
2833
}

‎pkg/cmd/server/kubernetes/master/master_config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ func BuildControllerManagerServer(masterConfig configapi.MasterConfig) (*cmapp.C
318318
cmserver.PodEvictionTimeout = metav1.Duration{Duration: podEvictionTimeout}
319319
cmserver.VolumeConfiguration.EnableDynamicProvisioning = masterConfig.VolumeConfig.DynamicProvisioningEnabled
320320

321+
// IF YOU ADD ANYTHING TO THIS LIST, MAKE SURE THAT YOU UPDATE THEIR STRATEGIES TO PREVENT GC FINALIZERS
321322
cmserver.GCIgnoredResources = append(cmserver.GCIgnoredResources,
322323
// explicitly disabled from GC for now - not enough value to track them
323324
componentconfig.GroupResource{Group: "authorization.openshift.io", Resource: "rolebindingrestrictions"},

‎pkg/image/registry/image/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/util/validation/field"
1111
apirequest "k8s.io/apiserver/pkg/endpoints/request"
1212
"k8s.io/apiserver/pkg/registry/generic"
13+
"k8s.io/apiserver/pkg/registry/rest"
1314
kstorage "k8s.io/apiserver/pkg/storage"
1415
"k8s.io/apiserver/pkg/storage/names"
1516
kapi "k8s.io/kubernetes/pkg/api"
@@ -28,6 +29,10 @@ type imageStrategy struct {
2829
// Image objects via the REST API.
2930
var Strategy = imageStrategy{kapi.Scheme, names.SimpleNameGenerator}
3031

32+
func (imageStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
33+
return rest.Unsupported
34+
}
35+
3136
// NamespaceScoped is false for images.
3237
func (imageStrategy) NamespaceScoped() bool {
3338
return false

‎pkg/oauth/registry/oauthaccesstoken/strategy.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ func NewStrategy(clientGetter oauthclient.Getter) strategy {
3333
return strategy{ObjectTyper: kapi.Scheme, clientGetter: clientGetter}
3434
}
3535

36+
func (strategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
37+
return rest.Unsupported
38+
}
39+
3640
func (strategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
3741

3842
// NamespaceScoped is false for OAuth objects

‎pkg/oauth/registry/oauthauthorizetoken/strategy.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ func NewStrategy(clientGetter oauthclient.Getter) strategy {
3333
return strategy{ObjectTyper: kapi.Scheme, clientGetter: clientGetter}
3434
}
3535

36+
func (strategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
37+
return rest.Unsupported
38+
}
39+
3640
func (strategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
3741

3842
// NamespaceScoped is false for OAuth objects

‎pkg/oauth/registry/oauthclient/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"k8s.io/apimachinery/pkg/runtime"
1111
"k8s.io/apimachinery/pkg/util/validation/field"
1212
apirequest "k8s.io/apiserver/pkg/endpoints/request"
13+
"k8s.io/apiserver/pkg/registry/rest"
1314
kstorage "k8s.io/apiserver/pkg/storage"
1415
kapi "k8s.io/kubernetes/pkg/api"
1516
)
@@ -23,6 +24,10 @@ type strategy struct {
2324
// objects via the REST API.
2425
var Strategy = strategy{kapi.Scheme}
2526

27+
func (strategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
28+
return rest.Unsupported
29+
}
30+
2631
func (strategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2732

2833
// NamespaceScoped is false for OAuth objects

‎pkg/oauth/registry/oauthclientauthorization/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"k8s.io/apimachinery/pkg/runtime"
1212
"k8s.io/apimachinery/pkg/util/validation/field"
1313
apirequest "k8s.io/apiserver/pkg/endpoints/request"
14+
"k8s.io/apiserver/pkg/registry/rest"
1415
kstorage "k8s.io/apiserver/pkg/storage"
1516
kapi "k8s.io/kubernetes/pkg/api"
1617

@@ -29,6 +30,10 @@ func NewStrategy(clientGetter oauthclient.Getter) strategy {
2930
return strategy{ObjectTyper: kapi.Scheme, clientGetter: clientGetter}
3031
}
3132

33+
func (strategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
34+
return rest.Unsupported
35+
}
36+
3237
func (strategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {
3338
auth := obj.(*oauthapi.OAuthClientAuthorization)
3439
auth.Name = fmt.Sprintf("%s:%s", auth.UserName, auth.ClientName)

‎pkg/quota/registry/clusterresourcequota/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
"k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -21,6 +22,10 @@ type strategy struct {
2122

2223
var Strategy = strategy{kapi.Scheme}
2324

25+
func (strategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
26+
return rest.Unsupported
27+
}
28+
2429
func (strategy) NamespaceScoped() bool {
2530
return false
2631
}

‎pkg/sdn/registry/clusternetwork/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
"k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type sdnStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = sdnStrategy{kapi.Scheme}
2627

28+
func (sdnStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (sdnStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// NamespaceScoped is false for sdns

‎pkg/sdn/registry/egressnetworkpolicy/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
"k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type enpStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = enpStrategy{kapi.Scheme}
2627

28+
func (enpStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (enpStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// NamespaceScoped is true for egress network policy

‎pkg/sdn/registry/hostsubnet/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
"k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type sdnStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = sdnStrategy{kapi.Scheme}
2627

28+
func (sdnStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (sdnStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// Canonicalize normalizes the object after validation.

‎pkg/sdn/registry/netnamespace/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
"k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type sdnStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = sdnStrategy{kapi.Scheme}
2627

28+
func (sdnStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (sdnStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// Canonicalize normalizes the object after validation.

‎pkg/user/registry/group/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
kstorage "k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type groupStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = groupStrategy{kapi.Scheme}
2627

28+
func (groupStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (groupStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// NamespaceScoped is false for groups

‎pkg/user/registry/identity/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
kstorage "k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type identityStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = identityStrategy{kapi.Scheme}
2627

28+
func (identityStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (identityStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// NamespaceScoped is false for users

‎pkg/user/registry/user/strategy.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime"
99
"k8s.io/apimachinery/pkg/util/validation/field"
1010
apirequest "k8s.io/apiserver/pkg/endpoints/request"
11+
"k8s.io/apiserver/pkg/registry/rest"
1112
kstorage "k8s.io/apiserver/pkg/storage"
1213
kapi "k8s.io/kubernetes/pkg/api"
1314

@@ -24,6 +25,10 @@ type userStrategy struct {
2425
// objects via the REST API.
2526
var Strategy = userStrategy{kapi.Scheme}
2627

28+
func (userStrategy) DefaultGarbageCollectionPolicy() rest.GarbageCollectionPolicy {
29+
return rest.Unsupported
30+
}
31+
2732
func (userStrategy) PrepareForUpdate(ctx apirequest.Context, obj, old runtime.Object) {}
2833

2934
// NamespaceScoped is false for users

‎vendor/k8s.io/kubernetes/pkg/registry/core/event/strategy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)