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
daf5e155
Commit
daf5e155
authored
Jun 03, 2018
by
Koonwah Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add NON_MASTER_NODE_LABELS to config-test.sh
parent
37059e7e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
4 deletions
+10
-4
config-test.sh
cluster/gce/config-test.sh
+10
-4
No files found.
cluster/gce/config-test.sh
View file @
daf5e155
...
@@ -212,6 +212,16 @@ NODE_LABELS="${KUBE_NODE_LABELS:-beta.kubernetes.io/fluentd-ds-ready=true}"
...
@@ -212,6 +212,16 @@ NODE_LABELS="${KUBE_NODE_LABELS:-beta.kubernetes.io/fluentd-ds-ready=true}"
# NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes.
# NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes.
NON_MASTER_NODE_LABELS
=
"
${
KUBE_NON_MASTER_NODE_LABELS
:-}
"
NON_MASTER_NODE_LABELS
=
"
${
KUBE_NON_MASTER_NODE_LABELS
:-}
"
# Optional: Enable netd.
ENABLE_NETD
=
"
${
KUBE_ENABLE_NETD
:-
false
}
"
CUSTOM_NETD_YAML
=
"
${
KUBE_CUSTOM_NETD_YAML
:-}
"
# To avoid running netd on a node that is not configured appropriately,
# label each Node so that the DaemonSet can run the Pods only on ready Nodes.
if
[[
${
ENABLE_NETD
:-}
==
"true"
]]
;
then
NON_MASTER_NODE_LABELS
=
"
${
NON_MASTER_NODE_LABELS
:+
${
NON_MASTER_NODE_LABELS
}
,
}
beta.kubernetes.io/kube-netd-ready=true"
fi
# 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.
# label each Node so that the DaemonSet can run the Pods only on ready Nodes.
if
[[
${
NETWORK_POLICY_PROVIDER
:-}
==
"calico"
]]
;
then
if
[[
${
NETWORK_POLICY_PROVIDER
:-}
==
"calico"
]]
;
then
...
@@ -359,10 +369,6 @@ STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-}
...
@@ -359,10 +369,6 @@ STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-}
NETWORK_PROVIDER
=
"
${
NETWORK_PROVIDER
:-
kubenet
}
"
# none, kubenet
NETWORK_PROVIDER
=
"
${
NETWORK_PROVIDER
:-
kubenet
}
"
# none, kubenet
# Optional: Enable netd.
ENABLE_NETD
=
"
${
KUBE_ENABLE_NETD
:-
false
}
"
CUSTOM_NETD_YAML
=
"
${
KUBE_CUSTOM_NETD_YAML
:-}
"
# Network Policy plugin specific settings.
# Network Policy plugin specific settings.
NETWORK_POLICY_PROVIDER
=
"
${
NETWORK_POLICY_PROVIDER
:-
none
}
"
# calico
NETWORK_POLICY_PROVIDER
=
"
${
NETWORK_POLICY_PROVIDER
:-
none
}
"
# calico
...
...
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