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
37046e30
Commit
37046e30
authored
Apr 03, 2019
by
Dr. Stefan Schimanski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle feature gate errors
parent
7cdd26e1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
6 deletions
+19
-6
BUILD
pkg/features/BUILD
+1
-0
kube_features.go
pkg/features/kube_features.go
+2
-1
validation.go
pkg/kubelet/apis/config/validation/validation.go
+3
-1
BUILD
staging/src/k8s.io/apiserver/pkg/features/BUILD
+4
-1
kube_features.go
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+3
-1
kubelet.go
test/e2e_node/services/kubelet.go
+3
-1
services.go
test/e2e_node/services/services.go
+3
-1
No files found.
pkg/features/BUILD
View file @
37046e30
...
...
@@ -11,6 +11,7 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/features",
deps = [
"//staging/src/k8s.io/apiextensions-apiserver/pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/features:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/cloud-provider/features:go_default_library",
...
...
pkg/features/kube_features.go
View file @
37046e30
...
...
@@ -18,6 +18,7 @@ package features
import
(
apiextensionsfeatures
"k8s.io/apiextensions-apiserver/pkg/features"
"k8s.io/apimachinery/pkg/util/runtime"
genericfeatures
"k8s.io/apiserver/pkg/features"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
cloudfeatures
"k8s.io/cloud-provider/features"
...
...
@@ -436,7 +437,7 @@ const (
)
func
init
()
{
utilfeature
.
DefaultMutableFeatureGate
.
Add
(
defaultKubernetesFeatureGates
)
runtime
.
Must
(
utilfeature
.
DefaultMutableFeatureGate
.
Add
(
defaultKubernetesFeatureGates
)
)
}
// defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.
...
...
pkg/kubelet/apis/config/validation/validation.go
View file @
37046e30
...
...
@@ -35,7 +35,9 @@ func ValidateKubeletConfiguration(kc *kubeletconfig.KubeletConfiguration) error
// Make a local copy of the global feature gates and combine it with the gates set by this configuration.
// This allows us to validate the config against the set of gates it will actually run against.
localFeatureGate
:=
utilfeature
.
DefaultFeatureGate
.
DeepCopy
()
localFeatureGate
.
SetFromMap
(
kc
.
FeatureGates
)
if
err
:=
localFeatureGate
.
SetFromMap
(
kc
.
FeatureGates
);
err
!=
nil
{
return
err
}
if
kc
.
NodeLeaseDurationSeconds
<=
0
{
allErrors
=
append
(
allErrors
,
fmt
.
Errorf
(
"invalid configuration: NodeLeaseDurationSeconds must be greater than 0"
))
...
...
staging/src/k8s.io/apiserver/pkg/features/BUILD
View file @
37046e30
...
...
@@ -10,7 +10,10 @@ go_library(
srcs = ["kube_features.go"],
importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/features",
importpath = "k8s.io/apiserver/pkg/features",
deps = ["//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
],
)
filegroup(
...
...
staging/src/k8s.io/apiserver/pkg/features/kube_features.go
View file @
37046e30
...
...
@@ -17,6 +17,8 @@ limitations under the License.
package
features
import
(
"k8s.io/apimachinery/pkg/util/runtime"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
)
...
...
@@ -110,7 +112,7 @@ const (
)
func
init
()
{
utilfeature
.
DefaultMutableFeatureGate
.
Add
(
defaultKubernetesFeatureGates
)
runtime
.
Must
(
utilfeature
.
DefaultMutableFeatureGate
.
Add
(
defaultKubernetesFeatureGates
)
)
}
// defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.
...
...
test/e2e_node/services/kubelet.go
View file @
37046e30
...
...
@@ -108,7 +108,9 @@ func (e *E2EServices) startKubelet() (*server, error) {
klog
.
Info
(
"Starting kubelet"
)
// set feature gates so we can check which features are enabled and pass the appropriate flags
utilfeature
.
DefaultMutableFeatureGate
.
SetFromMap
(
framework
.
TestContext
.
FeatureGates
)
if
err
:=
utilfeature
.
DefaultMutableFeatureGate
.
SetFromMap
(
framework
.
TestContext
.
FeatureGates
);
err
!=
nil
{
return
nil
,
err
}
// Build kubeconfig
kubeconfigPath
,
err
:=
createKubeconfigCWD
()
...
...
test/e2e_node/services/services.go
View file @
37046e30
...
...
@@ -109,7 +109,9 @@ func (e *E2EServices) Stop() {
func
RunE2EServices
(
t
*
testing
.
T
)
{
// Populate global DefaultFeatureGate with value from TestContext.FeatureGates.
// This way, statically-linked components see the same feature gate config as the test context.
utilfeature
.
DefaultMutableFeatureGate
.
SetFromMap
(
framework
.
TestContext
.
FeatureGates
)
if
err
:=
utilfeature
.
DefaultMutableFeatureGate
.
SetFromMap
(
framework
.
TestContext
.
FeatureGates
);
err
!=
nil
{
t
.
Fatal
(
err
)
}
e
:=
newE2EServices
()
if
err
:=
e
.
run
(
t
);
err
!=
nil
{
klog
.
Fatalf
(
"Failed to run e2e services: %v"
,
err
)
...
...
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