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
5dca8e00
Commit
5dca8e00
authored
Oct 10, 2018
by
Antoine Pelisse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dry-run: Promote from Alpha to Beta
Also remove the test that used to check that the dry-run flag is forbidden.
parent
8042411f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
+12
-4
kube_features.go
pkg/features/kube_features.go
+1
-1
BUILD
staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
+3
-0
apiserver_test.go
staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
+6
-2
kube_features.go
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+2
-1
No files found.
pkg/features/kube_features.go
View file @
5dca8e00
...
@@ -451,7 +451,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
...
@@ -451,7 +451,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
genericfeatures
.
APIResponseCompression
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
genericfeatures
.
APIResponseCompression
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
genericfeatures
.
Initializers
:
{
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
:
false
,
PreRelease
:
utilfeature
.
Alph
a
},
genericfeatures
.
DryRun
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Bet
a
},
// inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed
// inherited features from apiextensions-apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side:
// unintentionally on either side:
...
...
staging/src/k8s.io/apiserver/pkg/endpoints/BUILD
View file @
5dca8e00
...
@@ -49,8 +49,11 @@ go_test(
...
@@ -49,8 +49,11 @@ go_test(
"//staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/endpoints/testing:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/endpoints/testing:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/features:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/filters:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/filters:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
"//vendor/github.com/emicklei/go-restful:go_default_library",
"//vendor/github.com/emicklei/go-restful:go_default_library",
"//vendor/golang.org/x/net/websocket:go_default_library",
"//vendor/golang.org/x/net/websocket:go_default_library",
],
],
...
...
staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
View file @
5dca8e00
...
@@ -38,7 +38,6 @@ import (
...
@@ -38,7 +38,6 @@ import (
"time"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful"
fuzzer
"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
fuzzer
"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apierrs
"k8s.io/apimachinery/pkg/api/errors"
apierrs
"k8s.io/apimachinery/pkg/api/errors"
...
@@ -68,8 +67,11 @@ import (
...
@@ -68,8 +67,11 @@ import (
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/endpoints/request"
genericapitesting
"k8s.io/apiserver/pkg/endpoints/testing"
genericapitesting
"k8s.io/apiserver/pkg/endpoints/testing"
"k8s.io/apiserver/pkg/features"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/server/filters"
"k8s.io/apiserver/pkg/server/filters"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting
"k8s.io/apiserver/pkg/util/feature/testing"
)
)
type
alwaysMutatingDeny
struct
{}
type
alwaysMutatingDeny
struct
{}
...
@@ -3865,7 +3867,9 @@ func (storage *SimpleRESTStorageWithDeleteCollection) DeleteCollection(ctx conte
...
@@ -3865,7 +3867,9 @@ func (storage *SimpleRESTStorageWithDeleteCollection) DeleteCollection(ctx conte
return
nil
,
nil
return
nil
,
nil
}
}
func
TestDryRun
(
t
*
testing
.
T
)
{
func
TestDryRunDisabled
(
t
*
testing
.
T
)
{
defer
utilfeaturetesting
.
SetFeatureGateDuringTest
(
t
,
utilfeature
.
DefaultFeatureGate
,
features
.
DryRun
,
false
)()
tests
:=
[]
struct
{
tests
:=
[]
struct
{
path
string
path
string
verb
string
verb
string
...
...
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View file @
5dca8e00
...
@@ -75,6 +75,7 @@ const (
...
@@ -75,6 +75,7 @@ const (
// owner: @apelisse
// owner: @apelisse
// alpha: v1.12
// alpha: v1.12
// beta: v1.13
//
//
// Allow requests to be processed but not stored, so that
// Allow requests to be processed but not stored, so that
// validation, merging, mutation can be tested without
// validation, merging, mutation can be tested without
...
@@ -96,5 +97,5 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
...
@@ -96,5 +97,5 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
APIResponseCompression
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
APIResponseCompression
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
Initializers
:
{
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
:
false
,
PreRelease
:
utilfeature
.
Alph
a
},
DryRun
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Bet
a
},
}
}
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