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
40ebed84
Commit
40ebed84
authored
Apr 01, 2015
by
Robert Bailey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove salt configuration that matches the default settings in
the Kubelet.
parent
92b6f49b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
default
cluster/saltbase/salt/kubelet/default
+1
-6
server.go
cmd/kubelet/app/server.go
+2
-1
No files found.
cluster/saltbase/salt/kubelet/default
View file @
40ebed84
...
...
@@ -15,17 +15,12 @@
{% set api_servers = "--api_servers=https://" + ips[0][0] + ":6443" -%}
{% endif -%}
{% set address = "--address=0.0.0.0" -%}
{% set config = "--config=/etc/kubernetes/manifests" -%}
{% set hostname_override = "" -%}
{% if grains.minion_ip is defined -%}
{% set hostname_override = " --hostname_override=" + grains.minion_ip -%}
{% endif -%}
{% set auth_path = "--auth_path=/var/lib/kubelet/kubernetes_auth" -%}
{% set registry_qps = "--registry_qps=0.1" %}
{% set cluster_dns = "" %}
{% set cluster_domain = "" %}
{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
...
...
@@ -33,4 +28,4 @@
{% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %}
{% endif %}
DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{
auth_path}} {{hostname_override}} {{address
}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}"
DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{
hostname_override
}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}"
cmd/kubelet/app/server.go
View file @
40ebed84
...
...
@@ -102,7 +102,7 @@ func NewKubeletServer() *KubeletServer {
FileCheckFrequency
:
20
*
time
.
Second
,
HTTPCheckFrequency
:
20
*
time
.
Second
,
EnableServer
:
true
,
Address
:
util
.
IP
(
net
.
ParseIP
(
"
127.0.0.1
"
)),
Address
:
util
.
IP
(
net
.
ParseIP
(
"
0.0.0.0
"
)),
Port
:
ports
.
KubeletPort
,
PodInfraContainerImage
:
kubelet
.
PodInfraContainerImage
,
RootDirectory
:
defaultRootDir
,
...
...
@@ -111,6 +111,7 @@ func NewKubeletServer() *KubeletServer {
MinimumGCAge
:
1
*
time
.
Minute
,
MaxPerPodContainerCount
:
5
,
MaxContainerCount
:
100
,
AuthPath
:
"/var/lib/kubelet/kubernetes_auth"
,
CadvisorPort
:
4194
,
HealthzPort
:
10248
,
HealthzBindAddress
:
util
.
IP
(
net
.
ParseIP
(
"127.0.0.1"
)),
...
...
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