Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c1409ce4
Commit
c1409ce4
authored
Dec 27, 2018
by
Darren Shepherd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Initializers
parent
0c375f32
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
41 deletions
+3
-41
kube_features.go
pkg/features/kube_features.go
+0
-1
persistent_volume_claims.go
pkg/quota/v1/evaluator/core/persistent_volume_claims.go
+0
-7
strategy.go
pkg/registry/core/pod/strategy.go
+0
-14
kube_features.go
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+0
-8
create.go
staging/src/k8s.io/apiserver/pkg/registry/rest/create.go
+1
-5
update.go
staging/src/k8s.io/apiserver/pkg/registry/rest/update.go
+2
-6
No files found.
pkg/features/kube_features.go
View file @
c1409ce4
...
@@ -308,7 +308,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
...
@@ -308,7 +308,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
genericfeatures
.
StreamingProxyRedirects
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
genericfeatures
.
StreamingProxyRedirects
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
genericfeatures
.
AdvancedAuditing
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
genericfeatures
.
AdvancedAuditing
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
genericfeatures
.
DynamicAuditing
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
genericfeatures
.
DynamicAuditing
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
genericfeatures
.
Initializers
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
genericfeatures
.
APIListChunking
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
genericfeatures
.
APIListChunking
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
genericfeatures
.
DryRun
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
genericfeatures
.
DryRun
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
...
...
pkg/quota/v1/evaluator/core/persistent_volume_claims.go
View file @
c1409ce4
...
@@ -27,7 +27,6 @@ import (
...
@@ -27,7 +27,6 @@ import (
"k8s.io/apimachinery/pkg/util/initialization"
"k8s.io/apimachinery/pkg/util/initialization"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
utilruntime
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/features"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
api
"k8s.io/kubernetes/pkg/apis/core"
api
"k8s.io/kubernetes/pkg/apis/core"
k8s_api_v1
"k8s.io/kubernetes/pkg/apis/core/v1"
k8s_api_v1
"k8s.io/kubernetes/pkg/apis/core/v1"
...
@@ -173,12 +172,6 @@ func (p *pvcEvaluator) Usage(item runtime.Object) (corev1.ResourceList, error) {
...
@@ -173,12 +172,6 @@ func (p *pvcEvaluator) Usage(item runtime.Object) (corev1.ResourceList, error) {
// charge for claim
// charge for claim
result
[
corev1
.
ResourcePersistentVolumeClaims
]
=
*
(
resource
.
NewQuantity
(
1
,
resource
.
DecimalSI
))
result
[
corev1
.
ResourcePersistentVolumeClaims
]
=
*
(
resource
.
NewQuantity
(
1
,
resource
.
DecimalSI
))
result
[
pvcObjectCountName
]
=
*
(
resource
.
NewQuantity
(
1
,
resource
.
DecimalSI
))
result
[
pvcObjectCountName
]
=
*
(
resource
.
NewQuantity
(
1
,
resource
.
DecimalSI
))
if
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
Initializers
)
{
if
!
initialization
.
IsInitialized
(
pvc
.
Initializers
)
{
// Only charge pvc count for uninitialized pvc.
return
result
,
nil
}
}
storageClassRef
:=
helper
.
GetPersistentVolumeClaimClass
(
pvc
)
storageClassRef
:=
helper
.
GetPersistentVolumeClaimClass
(
pvc
)
if
len
(
storageClassRef
)
>
0
{
if
len
(
storageClassRef
)
>
0
{
storageClassClaim
:=
corev1
.
ResourceName
(
storageClassRef
+
storageClassSuffix
+
string
(
corev1
.
ResourcePersistentVolumeClaims
))
storageClassClaim
:=
corev1
.
ResourceName
(
storageClassRef
+
storageClassSuffix
+
string
(
corev1
.
ResourcePersistentVolumeClaims
))
...
...
pkg/registry/core/pod/strategy.go
View file @
c1409ce4
...
@@ -27,7 +27,6 @@ import (
...
@@ -27,7 +27,6 @@ import (
"time"
"time"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
apimachineryvalidation
"k8s.io/apimachinery/pkg/apis/meta/v1/validation"
apimachineryvalidation
"k8s.io/apimachinery/pkg/apis/meta/v1/validation"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/fields"
...
@@ -36,11 +35,9 @@ import (
...
@@ -36,11 +35,9 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/types"
utilnet
"k8s.io/apimachinery/pkg/util/net"
utilnet
"k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage"
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/apiserver/pkg/storage/names"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"
podutil
"k8s.io/kubernetes/pkg/api/pod"
podutil
"k8s.io/kubernetes/pkg/api/pod"
api
"k8s.io/kubernetes/pkg/apis/core"
api
"k8s.io/kubernetes/pkg/apis/core"
...
@@ -102,17 +99,6 @@ func (podStrategy) AllowCreateOnUpdate() bool {
...
@@ -102,17 +99,6 @@ func (podStrategy) AllowCreateOnUpdate() bool {
}
}
func
isUpdatingUninitializedPod
(
old
runtime
.
Object
)
(
bool
,
error
)
{
func
isUpdatingUninitializedPod
(
old
runtime
.
Object
)
(
bool
,
error
)
{
if
!
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
Initializers
)
{
return
false
,
nil
}
oldMeta
,
err
:=
meta
.
Accessor
(
old
)
if
err
!=
nil
{
return
false
,
err
}
oldInitializers
:=
oldMeta
.
GetInitializers
()
if
oldInitializers
!=
nil
&&
len
(
oldInitializers
.
Pending
)
!=
0
{
return
true
,
nil
}
return
false
,
nil
return
false
,
nil
}
}
...
...
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View file @
c1409ce4
...
@@ -60,13 +60,6 @@ const (
...
@@ -60,13 +60,6 @@ const (
DynamicAuditing
utilfeature
.
Feature
=
"DynamicAuditing"
DynamicAuditing
utilfeature
.
Feature
=
"DynamicAuditing"
// owner: @smarterclayton
// owner: @smarterclayton
// alpha: v1.7
//
// Allow asynchronous coordination of object creation.
// Auto-enabled by the Initializers admission plugin.
Initializers
utilfeature
.
Feature
=
"Initializers"
// owner: @smarterclayton
// alpha: v1.8
// alpha: v1.8
// beta: v1.9
// beta: v1.9
//
//
...
@@ -96,7 +89,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
...
@@ -96,7 +89,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
ValidateProxyRedirects
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
ValidateProxyRedirects
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
AdvancedAuditing
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
AdvancedAuditing
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
DynamicAuditing
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
DynamicAuditing
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
Initializers
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
APIListChunking
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
APIListChunking
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
DryRun
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
DryRun
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
}
}
staging/src/k8s.io/apiserver/pkg/registry/rest/create.go
View file @
c1409ce4
...
@@ -28,9 +28,7 @@ import (
...
@@ -28,9 +28,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/apiserver/pkg/storage/names"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
)
)
// RESTCreateStrategy defines the minimum validation, accepted input, and
// RESTCreateStrategy defines the minimum validation, accepted input, and
...
@@ -93,9 +91,7 @@ func BeforeCreate(strategy RESTCreateStrategy, ctx context.Context, obj runtime.
...
@@ -93,9 +91,7 @@ func BeforeCreate(strategy RESTCreateStrategy, ctx context.Context, obj runtime.
}
}
// Ensure Initializers are not set unless the feature is enabled
// Ensure Initializers are not set unless the feature is enabled
if
!
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
Initializers
)
{
objectMeta
.
SetInitializers
(
nil
)
objectMeta
.
SetInitializers
(
nil
)
}
// ClusterName is ignored and should not be saved
// ClusterName is ignored and should not be saved
if
len
(
objectMeta
.
GetClusterName
())
>
0
{
if
len
(
objectMeta
.
GetClusterName
())
>
0
{
...
...
staging/src/k8s.io/apiserver/pkg/registry/rest/update.go
View file @
c1409ce4
...
@@ -28,8 +28,6 @@ import (
...
@@ -28,8 +28,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/features"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
)
)
// RESTUpdateStrategy defines the minimum validation, accepted input, and
// RESTUpdateStrategy defines the minimum validation, accepted input, and
...
@@ -105,10 +103,8 @@ func BeforeUpdate(strategy RESTUpdateStrategy, ctx context.Context, obj, old run
...
@@ -105,10 +103,8 @@ func BeforeUpdate(strategy RESTUpdateStrategy, ctx context.Context, obj, old run
objectMeta
.
SetGeneration
(
oldMeta
.
GetGeneration
())
objectMeta
.
SetGeneration
(
oldMeta
.
GetGeneration
())
// Ensure Initializers are not set unless the feature is enabled
// Ensure Initializers are not set unless the feature is enabled
if
!
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
Initializers
)
{
oldMeta
.
SetInitializers
(
nil
)
oldMeta
.
SetInitializers
(
nil
)
objectMeta
.
SetInitializers
(
nil
)
objectMeta
.
SetInitializers
(
nil
)
}
strategy
.
PrepareForUpdate
(
ctx
,
obj
,
old
)
strategy
.
PrepareForUpdate
(
ctx
,
obj
,
old
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment