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
6578d5e8
Commit
6578d5e8
authored
Mar 07, 2017
by
Yu-Ju Hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "kubemark: enable CRI for the hollow nodes"
This reverts commit
c89e9cdb
.
parent
d6ae61c3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
hollow_kubelet.go
pkg/kubemark/hollow_kubelet.go
+2
-0
No files found.
pkg/kubemark/hollow_kubelet.go
View file @
6578d5e8
...
@@ -159,6 +159,8 @@ func GetHollowKubeletConfig(
...
@@ -159,6 +159,8 @@ func GetHollowKubeletConfig(
c
.
SerializeImagePulls
=
true
c
.
SerializeImagePulls
=
true
c
.
SystemCgroups
=
""
c
.
SystemCgroups
=
""
c
.
ProtectKernelDefaults
=
false
c
.
ProtectKernelDefaults
=
false
// TODO: This is a temporary workaround until we fix CRI+kubemark properly.
c
.
EnableCRI
=
false
// TODO(mtaufen): Note that PodInfraContainerImage was being set to the empty value before,
// TODO(mtaufen): Note that PodInfraContainerImage was being set to the empty value before,
// but this may not have been intentional. (previous code (SimpleKubelet)
// but this may not have been intentional. (previous code (SimpleKubelet)
...
...
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