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
2ef81576
Commit
2ef81576
authored
May 16, 2018
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove v190 from kubeadm in v1.11 cycle
parent
95b4ce0b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
13 deletions
+5
-13
features.go
cmd/kubeadm/app/features/features.go
+3
-5
features_test.go
cmd/kubeadm/app/features/features_test.go
+2
-8
No files found.
cmd/kubeadm/app/features/features.go
View file @
2ef81576
...
...
@@ -46,16 +46,14 @@ const (
Auditing
=
"Auditing"
)
var
v190
=
version
.
MustParseSemantic
(
"v1.9.0-alpha.1"
)
// InitFeatureGates are the default feature gates for the init command
var
InitFeatureGates
=
FeatureList
{
SelfHosting
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
}},
StoreCertsInSecrets
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
}},
// We don't want to advertise this feature gate exists in v1.9 to avoid confusion as it is not yet working
HighAvailability
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
MinimumVersion
:
v190
,
HiddenInHelpText
:
true
},
CoreDNS
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
}
,
MinimumVersion
:
v190
},
DynamicKubeletConfig
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
}
,
MinimumVersion
:
v190
},
HighAvailability
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
HiddenInHelpText
:
true
},
CoreDNS
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
}},
DynamicKubeletConfig
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
}},
Auditing
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
}},
}
...
...
cmd/kubeadm/app/features/features_test.go
View file @
2ef81576
...
...
@@ -121,7 +121,7 @@ func TestNewFeatureGate(t *testing.T) {
func
TestValidateVersion
(
t
*
testing
.
T
)
{
var
someFeatures
=
FeatureList
{
"feature1"
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
false
,
PreRelease
:
utilfeature
.
Beta
}},
"feature2"
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
true
,
PreRelease
:
utilfeature
.
Alpha
}
,
MinimumVersion
:
v190
},
"feature2"
:
{
FeatureSpec
:
utilfeature
.
FeatureSpec
{
Default
:
true
,
PreRelease
:
utilfeature
.
Alpha
}},
}
var
tests
=
[]
struct
{
...
...
@@ -133,16 +133,10 @@ func TestValidateVersion(t *testing.T) {
requestedFeatures
:
map
[
string
]
bool
{
"feature1"
:
true
},
expectedError
:
false
,
},
{
//
min version but correct value give
n
{
//
no min versio
n
requestedFeatures
:
map
[
string
]
bool
{
"feature2"
:
true
},
requestedVersion
:
"v1.9.0"
,
expectedError
:
false
,
},
{
//min version and incorrect value given
requestedFeatures
:
map
[
string
]
bool
{
"feature2"
:
true
},
requestedVersion
:
"v1.8.2"
,
expectedError
:
true
,
},
}
for
_
,
test
:=
range
tests
{
...
...
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