kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62097 from hzxuzhonghu/fix-change-log 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix 1.10 change log typo

**What this PR does / why we need it**:

Thanks to @christianhuening, find typo about `enable-admission-plugins` and `disable-admission-plugins`
They are plural.

**Release note**:

```release-note
NONE
```

Kubernetes-commit: da85a280beea4aaab5412b0e74ed40869095e551
This commit is contained in:
Kubernetes Publisher 2018-04-10 15:46:20 -07:00
parent b66f10671f 490c9a96c3
commit db908acedf
2 changed files with 241 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

464
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

18
pkg/server/options/admission_test.go
View File

@ -53,7 +53,7 @@ func TestEnabledPluginNames(t *testing.T) {
setDefaultOffPlugins: sets.NewString(),
},
// scenario 3: use default off plugins and specified by enable-admission-plugin with RecommendedPluginOrder
// scenario 3: use default off plugins and specified by enable-admission-plugins with RecommendedPluginOrder
{
expectedPluginNames: []string{"pluginA", "pluginB", "pluginC", "pluginD"},
setRecommendedPluginOrder: []string{"pluginA", "pluginB", "pluginC", "pluginD"},
@ -61,7 +61,7 @@ func TestEnabledPluginNames(t *testing.T) {
setEnablePlugins: []string{"pluginD", "pluginC"},
},
// scenario 4: use default off plugins and specified by disable-admission-plugin with RecommendedPluginOrder
// scenario 4: use default off plugins and specified by disable-admission-plugins with RecommendedPluginOrder
{
expectedPluginNames: []string{"pluginB"},
setRecommendedPluginOrder: []string{"pluginA", "pluginB", "pluginC", "pluginD"},
@ -69,7 +69,7 @@ func TestEnabledPluginNames(t *testing.T) {
setDisablePlugins: []string{"pluginA"},
},
// scenario 5: use default off plugins and specified by enable-admission-plugin and disable-admission-plugin with RecommendedPluginOrder
// scenario 5: use default off plugins and specified by enable-admission-plugins and disable-admission-plugins with RecommendedPluginOrder
{
expectedPluginNames: []string{"pluginA", "pluginC"},
setRecommendedPluginOrder: []string{"pluginA", "pluginB", "pluginC", "pluginD"},
@ -142,39 +142,39 @@ func TestValidate(t *testing.T) {
expectedResult: true,
},
// scenario 1: set both `--enable-admission-plugin` `--disable-admission-plugin`
// scenario 1: set both `--enable-admission-plugins` `--disable-admission-plugins`
{
setEnablePlugins: []string{"pluginA", "pluginB"},
setDisablePlugins: []string{"pluginC"},
expectedResult: true,
},
// scenario 2: set invalid `--enable-admission-plugin` `--disable-admission-plugin`
// scenario 2: set invalid `--enable-admission-plugins` `--disable-admission-plugins`
{
setEnablePlugins: []string{"pluginA", "pluginB"},
setDisablePlugins: []string{"pluginB"},
expectedResult: false,
},
// scenario 3: set only invalid `--enable-admission-plugin`
// scenario 3: set only invalid `--enable-admission-plugins`
{
setEnablePlugins: []string{"pluginA", "pluginE"},
expectedResult: false,
},
// scenario 4: set only invalid `--disable-admission-plugin`
// scenario 4: set only invalid `--disable-admission-plugins`
{
setDisablePlugins: []string{"pluginA", "pluginE"},
expectedResult: false,
},
// scenario 5: set valid `--enable-admission-plugin`
// scenario 5: set valid `--enable-admission-plugins`
{
setEnablePlugins: []string{"pluginA", "pluginB"},
expectedResult: true,
},
// scenario 6: set valid `--disable-admission-plugin`
// scenario 6: set valid `--disable-admission-plugins`
{
setDisablePlugins: []string{"pluginA"},
expectedResult: true,