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
992773a4
Commit
992773a4
authored
May 21, 2019
by
s-ito-ts
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add transforming of "pillar['dns_memory_limit']" to local-up-cluster.sh.
parent
8211cabf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
local-up-cluster.sh
hack/local-up-cluster.sh
+2
-0
No files found.
hack/local-up-cluster.sh
View file @
992773a4
...
@@ -65,6 +65,7 @@ ENABLE_CLUSTER_DNS=${KUBE_ENABLE_CLUSTER_DNS:-true}
...
@@ -65,6 +65,7 @@ ENABLE_CLUSTER_DNS=${KUBE_ENABLE_CLUSTER_DNS:-true}
ENABLE_NODELOCAL_DNS
=
${
KUBE_ENABLE_NODELOCAL_DNS
:-
false
}
ENABLE_NODELOCAL_DNS
=
${
KUBE_ENABLE_NODELOCAL_DNS
:-
false
}
DNS_SERVER_IP
=
${
KUBE_DNS_SERVER_IP
:-
10
.0.0.10
}
DNS_SERVER_IP
=
${
KUBE_DNS_SERVER_IP
:-
10
.0.0.10
}
LOCAL_DNS_IP
=
${
KUBE_LOCAL_DNS_IP
:-
169
.254.20.10
}
LOCAL_DNS_IP
=
${
KUBE_LOCAL_DNS_IP
:-
169
.254.20.10
}
DNS_MEMORY_LIMIT
=
${
KUBE_DNS_MEMORY_LIMIT
:-
170Mi
}
DNS_DOMAIN
=
${
KUBE_DNS_NAME
:-
"cluster.local"
}
DNS_DOMAIN
=
${
KUBE_DNS_NAME
:-
"cluster.local"
}
KUBECTL
=
${
KUBECTL
:-
"
${
KUBE_ROOT
}
/cluster/kubectl.sh"
}
KUBECTL
=
${
KUBECTL
:-
"
${
KUBE_ROOT
}
/cluster/kubectl.sh"
}
WAIT_FOR_URL_API_SERVER
=
${
WAIT_FOR_URL_API_SERVER
:-
60
}
WAIT_FOR_URL_API_SERVER
=
${
WAIT_FOR_URL_API_SERVER
:-
60
}
...
@@ -849,6 +850,7 @@ function start_kubedns {
...
@@ -849,6 +850,7 @@ function start_kubedns {
cp "
${
KUBE_ROOT
}
/cluster/addons/dns/kube-dns/kube-dns.yaml.in
" kube-dns.yaml
cp "
${
KUBE_ROOT
}
/cluster/addons/dns/kube-dns/kube-dns.yaml.in
" kube-dns.yaml
${
SED
}
-i -e "
s
/{{ pillar\[
'dns_domain'
\]
}
}
/
${
DNS_DOMAIN
}
/g
" kube-dns.yaml
${
SED
}
-i -e "
s
/{{ pillar\[
'dns_domain'
\]
}
}
/
${
DNS_DOMAIN
}
/g
" kube-dns.yaml
${
SED
}
-i -e "
s/
{{
pillar
\[
'dns_server'
\]
}}
/
${
DNS_SERVER_IP
}
/g
" kube-dns.yaml
${
SED
}
-i -e "
s/
{{
pillar
\[
'dns_server'
\]
}}
/
${
DNS_SERVER_IP
}
/g
" kube-dns.yaml
${
SED
}
-i -e "
s/
{{
pillar
\[
'dns_memory_limit'
\]
}}
/
${
DNS_MEMORY_LIMIT
}
/g
" kube-dns.yaml
# TODO update to dns role once we have one.
# TODO update to dns role once we have one.
# use kubectl to create kubedns addon
# use kubectl to create kubedns addon
${
KUBECTL
}
--kubeconfig="
${
CERT_DIR
}
/admin.kubeconfig
" --namespace=kube-system create -f kube-dns.yaml
${
KUBECTL
}
--kubeconfig="
${
CERT_DIR
}
/admin.kubeconfig
" --namespace=kube-system create -f kube-dns.yaml
...
...
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