-
Notifications
You must be signed in to change notification settings - Fork 4.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable ExperimentalCriticalPodAnnotation feature gate #3345
Merged
k8s-github-robot
merged 5 commits into
kubernetes:master
from
a-chernykh:enable-critical-feature-gate
Sep 25, 2017
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
11c702e
Enable ExperimentalCriticalPodAnnotation feature gate
a-chernykh fcf78eb
Document that ExperimentalCriticalPodAnnotation is enabled by default
a-chernykh 56553c5
Add ability to override feature gates and check version
a-chernykh b3acc4b
Merge branch 'master' into enable-critical-feature-gate
a-chernykh 4faa91e
Add to release notes for 1.8
a-chernykh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package components | ||
|
||
import ( | ||
"testing" | ||
|
||
"k8s.io/kops/pkg/apis/kops" | ||
"k8s.io/kops/pkg/assets" | ||
) | ||
|
||
func buildSpec() *kops.ClusterSpec { | ||
spec := kops.ClusterSpec{ | ||
KubernetesVersion: "1.6.2", | ||
ServiceClusterIPRange: "10.10.0.0/16", | ||
Kubelet: &kops.KubeletConfigSpec{}, | ||
} | ||
|
||
return &spec | ||
} | ||
|
||
func buildOptions(spec *kops.ClusterSpec) error { | ||
ab := assets.NewAssetBuilder(nil) | ||
|
||
ver, err := KubernetesVersion(spec) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
builder := KubeletOptionsBuilder{ | ||
Context: &OptionsContext{ | ||
AssetBuilder: ab, | ||
KubernetesVersion: *ver, | ||
}, | ||
} | ||
|
||
err = builder.BuildOptions(spec) | ||
if err != nil { | ||
return nil | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func TestFeatureGates(t *testing.T) { | ||
spec := buildSpec() | ||
err := buildOptions(spec) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
gates := spec.Kubelet.FeatureGates | ||
if gates["ExperimentalCriticalPodAnnotation"] != "true" { | ||
t.Errorf("ExperimentalCriticalPodAnnotation feature gate should be enabled by default") | ||
} | ||
} | ||
|
||
func TestFeatureGatesKubernetesVersion(t *testing.T) { | ||
spec := buildSpec() | ||
spec.KubernetesVersion = "1.4.0" | ||
err := buildOptions(spec) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
gates := spec.Kubelet.FeatureGates | ||
if _, found := gates["ExperimentalCriticalPodAnnotation"]; found { | ||
t.Errorf("ExperimentalCriticalPodAnnotation feature gate should not be added on Kubernetes < 1.5.2") | ||
} | ||
} | ||
|
||
func TestFeatureGatesOverride(t *testing.T) { | ||
spec := buildSpec() | ||
spec.Kubelet.FeatureGates = map[string]string{ | ||
"ExperimentalCriticalPodAnnotation": "false", | ||
} | ||
|
||
err := buildOptions(spec) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
gates := spec.Kubelet.FeatureGates | ||
if gates["ExperimentalCriticalPodAnnotation"] != "false" { | ||
t.Errorf("ExperimentalCriticalPodAnnotation feature should be disalbled") | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah - so this is annoying...
The problem is that
1.8.0-alpha.1
is considered to be less than1.8.0
. So1.8.0-alpha.1
wouldn't match "1.8".That said, we could just mask out the
alpha.1
version before the comparison - I do like this approach!