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
e309bd3a
Unverified
Commit
e309bd3a
authored
Aug 28, 2018
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated feature flags
parent
f0e2a249
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
26 deletions
+5
-26
kube_features.go
pkg/features/kube_features.go
+1
-16
kubelet_pods.go
pkg/kubelet/kubelet_pods.go
+1
-1
BUILD
pkg/registry/core/service/storage/BUILD
+0
-2
rest.go
pkg/registry/core/service/storage/rest.go
+3
-7
No files found.
pkg/features/kube_features.go
View file @
e309bd3a
...
...
@@ -173,13 +173,6 @@ const (
// Enable nodes to exclude themselves from service load balancers
ServiceNodeExclusion
utilfeature
.
Feature
=
"ServiceNodeExclusion"
// owner @brendandburns
// deprecated: v1.10
//
// Enable the service proxy to contact external IP addresses. Note this feature is present
// only for backward compatibility, it will be removed in the 1.11 release.
ServiceProxyAllowExternalIPs
utilfeature
.
Feature
=
"ServiceProxyAllowExternalIPs"
// owner: @jsafrane
// alpha: v1.9
//
...
...
@@ -241,13 +234,6 @@ const (
// Enable Hyper-V containers on Windows
HyperVContainer
utilfeature
.
Feature
=
"HyperVContainer"
// owner: @joelsmith
// deprecated: v1.10
//
// Mount secret, configMap, downwardAPI and projected volumes ReadOnly. Note: this feature
// gate is present only for backward compatibility, it will be removed in the 1.11 release.
ReadOnlyAPIDataVolumes
utilfeature
.
Feature
=
"ReadOnlyAPIDataVolumes"
// owner: @k82cn
// alpha: v1.10
//
...
...
@@ -433,6 +419,5 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
apiextensionsfeatures
.
CustomResourceSubresources
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Beta
},
// features that enable backwards compatibility but are scheduled to be removed
ServiceProxyAllowExternalIPs
:
{
Default
:
false
,
PreRelease
:
utilfeature
.
Deprecated
},
ReadOnlyAPIDataVolumes
:
{
Default
:
true
,
PreRelease
:
utilfeature
.
Deprecated
},
// ...
}
pkg/kubelet/kubelet_pods.go
View file @
e309bd3a
...
...
@@ -232,7 +232,7 @@ func makeMounts(pod *v1.Pod, podDir string, container *v1.Container, hostName, h
}
glog
.
V
(
5
)
.
Infof
(
"Pod %q container %q mount %q has propagation %q"
,
format
.
Pod
(
pod
),
container
.
Name
,
mount
.
Name
,
propagation
)
mustMountRO
:=
vol
.
Mounter
.
GetAttributes
()
.
ReadOnly
&&
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ReadOnlyAPIDataVolumes
)
mustMountRO
:=
vol
.
Mounter
.
GetAttributes
()
.
ReadOnly
mounts
=
append
(
mounts
,
kubecontainer
.
Mount
{
Name
:
mount
.
Name
,
...
...
pkg/registry/core/service/storage/BUILD
View file @
e309bd3a
...
...
@@ -55,7 +55,6 @@ go_library(
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/helper:go_default_library",
"//pkg/apis/core/validation:go_default_library",
"//pkg/features:go_default_library",
"//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library",
"//pkg/printers/storage:go_default_library",
...
...
@@ -76,7 +75,6 @@ go_library(
"//staging/src/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/dryrun:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
],
)
...
...
pkg/registry/core/service/storage/rest.go
View file @
e309bd3a
...
...
@@ -38,13 +38,11 @@ import (
genericapirequest
"k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/rest"
"k8s.io/apiserver/pkg/util/dryrun"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
apiservice
"k8s.io/kubernetes/pkg/api/service"
api
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/core/helper"
"k8s.io/kubernetes/pkg/apis/core/validation"
"k8s.io/kubernetes/pkg/features"
registry
"k8s.io/kubernetes/pkg/registry/core/service"
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/registry/core/service/portallocator"
...
...
@@ -483,11 +481,9 @@ func (rs *REST) ResourceLocation(ctx context.Context, id string) (*url.URL, http
// but in the expected case we'll only make one.
for
try
:=
0
;
try
<
len
(
ss
.
Addresses
);
try
++
{
addr
:=
ss
.
Addresses
[(
addrSeed
+
try
)
%
len
(
ss
.
Addresses
)]
if
!
utilfeature
.
DefaultFeatureGate
.
Enabled
(
features
.
ServiceProxyAllowExternalIPs
)
{
if
err
:=
isValidAddress
(
ctx
,
&
addr
,
rs
.
pods
);
err
!=
nil
{
utilruntime
.
HandleError
(
fmt
.
Errorf
(
"Address %v isn't valid (%v)"
,
addr
,
err
))
continue
}
if
err
:=
isValidAddress
(
ctx
,
&
addr
,
rs
.
pods
);
err
!=
nil
{
utilruntime
.
HandleError
(
fmt
.
Errorf
(
"Address %v isn't valid (%v)"
,
addr
,
err
))
continue
}
ip
:=
addr
.
IP
port
:=
int
(
ss
.
Ports
[
i
]
.
Port
)
...
...
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