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
df27ff2f
Commit
df27ff2f
authored
Oct 05, 2018
by
Darren Shepherd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove HyperVContainer
parent
40493a88
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
18 deletions
+1
-18
kube_features.go
pkg/features/kube_features.go
+0
-7
well_known_annotations_windows.go
pkg/kubelet/apis/well_known_annotations_windows.go
+1
-11
No files found.
pkg/features/kube_features.go
View file @
df27ff2f
...
@@ -173,12 +173,6 @@ const (
...
@@ -173,12 +173,6 @@ const (
// Implement IPVS-based in-cluster service load balancing
// Implement IPVS-based in-cluster service load balancing
SupportIPVSProxyMode
utilfeature
.
Feature
=
"SupportIPVSProxyMode"
SupportIPVSProxyMode
utilfeature
.
Feature
=
"SupportIPVSProxyMode"
// owner: @feiskyer
// alpha: v1.10
//
// Enable Hyper-V containers on Windows
HyperVContainer
utilfeature
.
Feature
=
"HyperVContainer"
// owner: @k82cn
// owner: @k82cn
// beta: v1.12
// beta: v1.12
//
//
...
@@ -347,7 +341,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
...
@@ -347,7 +341,6 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
BlockVolume
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
BlockVolume
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
StorageObjectInUseProtection
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
StorageObjectInUseProtection
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
SupportIPVSProxyMode
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
SupportIPVSProxyMode
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
GA
},
HyperVContainer
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Alpha
},
ScheduleDaemonSetPods
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
ScheduleDaemonSetPods
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
TokenRequest
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
TokenRequest
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
TokenRequestProjection
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
TokenRequestProjection
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
...
...
pkg/kubelet/apis/well_known_annotations_windows.go
View file @
df27ff2f
...
@@ -18,11 +18,6 @@ limitations under the License.
...
@@ -18,11 +18,6 @@ limitations under the License.
package
apis
package
apis
import
(
utilfeature
"k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/features"
)
const
(
const
(
// HypervIsolationAnnotationKey and HypervIsolationValue are used to run windows containers with hyperv isolation.
// HypervIsolationAnnotationKey and HypervIsolationValue are used to run windows containers with hyperv isolation.
// Refer https://aka.ms/hyperv-container.
// Refer https://aka.ms/hyperv-container.
...
@@ -32,10 +27,5 @@ const (
...
@@ -32,10 +27,5 @@ const (
// ShouldIsolatedByHyperV returns true if a windows container should be run with hyperv isolation.
// ShouldIsolatedByHyperV returns true if a windows container should be run with hyperv isolation.
func
ShouldIsolatedByHyperV
(
annotations
map
[
string
]
string
)
bool
{
func
ShouldIsolatedByHyperV
(
annotations
map
[
string
]
string
)
bool
{
if
!
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
HyperVContainer
)
{
return
false
return
false
}
v
,
ok
:=
annotations
[
HypervIsolationAnnotationKey
]
return
ok
&&
v
==
HypervIsolationValue
}
}
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