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
0ac34781
Commit
0ac34781
authored
Sep 07, 2017
by
Jacob Simpson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add env var to enable kubelet rotation in kube-up.sh.
parent
3c8fb4b9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
1 deletion
+15
-1
common.sh
cluster/common.sh
+5
-0
config-default.sh
cluster/gce/config-default.sh
+3
-0
config-test.sh
cluster/gce/config-test.sh
+4
-1
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+3
-0
No files found.
cluster/common.sh
View file @
0ac34781
...
...
@@ -757,6 +757,11 @@ EOF
FEATURE_GATES:
$(
yaml-quote
${
FEATURE_GATES
})
EOF
fi
if
[
-n
"
${
ROTATE_CERTIFICATES
:-}
"
]
;
then
cat
>>
$file
<<
EOF
ROTATE_CERTIFICATES:
$(
yaml-quote
${
ROTATE_CERTIFICATES
})
EOF
fi
if
[[
"
${
master
}
"
==
"true"
&&
"
${
MASTER_OS_DISTRIBUTION
}
"
==
"gci"
]]
||
[[
"
${
master
}
"
==
"false"
&&
"
${
NODE_OS_DISTRIBUTION
}
"
==
"gci"
]]
;
then
cat
>>
$file
<<
EOF
...
...
cluster/gce/config-default.sh
View file @
0ac34781
...
...
@@ -319,3 +319,6 @@ ENABLE_POD_PRIORITY="${ENABLE_POD_PRIORITY:-}"
if
[[
"
${
ENABLE_POD_PRIORITY
}
"
==
"true"
]]
;
then
FEATURE_GATES
=
"
${
FEATURE_GATES
}
,PodPriority=true"
fi
# Optional: enable certificate rotation of the kubelet certificates.
ROTATE_CERTIFICATES
=
"
${
ROTATE_CERTIFICATES
:-}
"
cluster/gce/config-test.sh
View file @
0ac34781
...
...
@@ -193,7 +193,7 @@ KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}"
# TODO(piosz): remove this in 1.8
NODE_LABELS
=
"
${
KUBE_NODE_LABELS
:-
beta
.kubernetes.io/fluentd-ds-ready=true
}
"
# To avoid running Calico on a node that is not configured appropriately,
# To avoid running Calico on a node that is not configured appropriately,
# label each Node so that the DaemonSet can run the Pods only on ready Nodes.
if
[[
${
NETWORK_POLICY_PROVIDER
:-}
==
"calico"
]]
;
then
NODE_LABELS
=
"
$NODE_LABELS
,projectcalico.org/ds-ready=true"
...
...
@@ -376,3 +376,6 @@ ENABLE_POD_PRIORITY="${ENABLE_POD_PRIORITY:-}"
if
[[
"
${
ENABLE_POD_PRIORITY
}
"
==
"true"
]]
;
then
FEATURE_GATES
=
"
${
FEATURE_GATES
}
,PodPriority=true"
fi
# Optional: enable certificate rotation of the kubelet certificates.
ROTATE_CERTIFICATES
=
"
${
ROTATE_CERTIFICATES
:-}
"
cluster/gce/gci/configure-helper.sh
View file @
0ac34781
...
...
@@ -961,6 +961,9 @@ function start-kubelet {
if
[[
-n
"
${
FEATURE_GATES
:-}
"
]]
;
then
flags+
=
" --feature-gates=
${
FEATURE_GATES
}
"
fi
if
[[
-n
"
${
ROTATE_CERTIFICATES
:-}
"
]]
;
then
flags+
=
" --rotate-certificates=true"
fi
local
-r
kubelet_env_file
=
"/etc/default/kubelet"
echo
"KUBELET_OPTS=
\"
${
flags
}
\"
"
>
"
${
kubelet_env_file
}
"
...
...
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