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
c7dcb61e
Unverified
Commit
c7dcb61e
authored
May 13, 2019
by
Davanum Srinivas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Same as defaulting allow-privileged to true
Change-Id: Ib0337bd4eabf9c0cc0d3b0c5a865ed0c468ba370
parent
9ba0d474
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
BUILD
cmd/kubelet/app/BUILD
+1
-0
server.go
cmd/kubelet/app/server.go
+5
-0
capabilities.go
pkg/capabilities/capabilities.go
+1
-2
No files found.
cmd/kubelet/app/BUILD
View file @
c7dcb61e
...
@@ -42,6 +42,7 @@ go_library(
...
@@ -42,6 +42,7 @@ go_library(
"//cmd/kubelet/app/options:go_default_library",
"//cmd/kubelet/app/options:go_default_library",
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/capabilities:go_default_library",
"//pkg/cloudprovider/providers:go_default_library",
"//pkg/cloudprovider/providers:go_default_library",
"//pkg/credentialprovider:go_default_library",
"//pkg/credentialprovider:go_default_library",
"//pkg/credentialprovider/aws:go_default_library",
"//pkg/credentialprovider/aws:go_default_library",
...
...
cmd/kubelet/app/server.go
View file @
c7dcb61e
...
@@ -64,6 +64,7 @@ import (
...
@@ -64,6 +64,7 @@ import (
"k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/legacyscheme"
api
"k8s.io/kubernetes/pkg/apis/core"
api
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/capabilities"
"k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet"
"k8s.io/kubernetes/pkg/kubelet"
...
@@ -973,6 +974,10 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie
...
@@ -973,6 +974,10 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie
// Setup event recorder if required.
// Setup event recorder if required.
makeEventRecorder
(
kubeDeps
,
nodeName
)
makeEventRecorder
(
kubeDeps
,
nodeName
)
capabilities
.
Initialize
(
capabilities
.
Capabilities
{
AllowPrivileged
:
true
,
})
credentialprovider
.
SetPreferredDockercfgPath
(
kubeServer
.
RootDirectory
)
credentialprovider
.
SetPreferredDockercfgPath
(
kubeServer
.
RootDirectory
)
klog
.
V
(
2
)
.
Infof
(
"Using root directory: %v"
,
kubeServer
.
RootDirectory
)
klog
.
V
(
2
)
.
Infof
(
"Using root directory: %v"
,
kubeServer
.
RootDirectory
)
...
...
pkg/capabilities/capabilities.go
View file @
c7dcb61e
...
@@ -61,10 +61,9 @@ func Initialize(c Capabilities) {
...
@@ -61,10 +61,9 @@ func Initialize(c Capabilities) {
}
}
// Setup the capability set. It wraps Initialize for improving usability.
// Setup the capability set. It wraps Initialize for improving usability.
func
Setup
(
allowPrivileged
bool
,
p
rivilegedSources
PrivilegedSources
,
p
erConnectionBytesPerSec
int64
)
{
func
Setup
(
allowPrivileged
bool
,
perConnectionBytesPerSec
int64
)
{
Initialize
(
Capabilities
{
Initialize
(
Capabilities
{
AllowPrivileged
:
allowPrivileged
,
AllowPrivileged
:
allowPrivileged
,
PrivilegedSources
:
privilegedSources
,
PerConnectionBandwidthLimitBytesPerSec
:
perConnectionBytesPerSec
,
PerConnectionBandwidthLimitBytesPerSec
:
perConnectionBytesPerSec
,
})
})
}
}
...
...
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