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
3faa38fc
Commit
3faa38fc
authored
Aug 18, 2016
by
YuPengZTE
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
The first letter should be capitalized
parent
ea69570f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
kube-addon-update.sh
cluster/addons/addon-manager/kube-addon-update.sh
+5
-5
common.sh
cluster/common.sh
+1
-1
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+1
-1
init.sls
cluster/saltbase/salt/docker/init.sls
+1
-1
util.sh
cluster/ubuntu/util.sh
+3
-3
util.sh
cluster/vsphere/util.sh
+2
-2
No files found.
cluster/addons/addon-manager/kube-addon-update.sh
View file @
3faa38fc
...
...
@@ -23,12 +23,12 @@
# LIMITATIONS
# 1.
c
ontrollers are not updated unless their name is changed
# 1.
C
ontrollers are not updated unless their name is changed
# 3. Services will not be updated unless their name is changed,
# but for services we actually want updates without name change.
# 4. Json files are not handled at all. Currently addons must be
# in yaml files
# 5.
e
xit code is probably not always correct (I haven't checked
# 5.
E
xit code is probably not always correct (I haven't checked
# carefully if it works in 100% cases)
# 6. There are no unittests
# 8. Will not work if the total length of paths to addons is greater than
...
...
@@ -36,9 +36,9 @@
# 9. Performance issue: yaml files are read many times in a single execution.
# cosmetic improvements to be done
# 1.
i
mprove the log function; add timestamp, file name, etc.
# 2.
l
ogging doesn't work from files that print things out.
# 3.
k
ubectl prints the output to stderr (the output should be captured and then
# 1.
I
mprove the log function; add timestamp, file name, etc.
# 2.
L
ogging doesn't work from files that print things out.
# 3.
K
ubectl prints the output to stderr (the output should be captured and then
# logged)
# global config
...
...
cluster/common.sh
View file @
3faa38fc
...
...
@@ -463,7 +463,7 @@ function stage-images() {
done
kube::util::wait-for-jobs
||
{
kube::log::error
"unable to push images.
s
ee
${
temp_dir
}
/*.log for more info."
kube::log::error
"unable to push images.
S
ee
${
temp_dir
}
/*.log for more info."
return
1
}
...
...
cluster/gce/gci/configure-helper.sh
View file @
3faa38fc
...
...
@@ -103,7 +103,7 @@ EOF
# files. Whenever logrotate is ran, this config will:
# * rotate the log file if its size is > 100Mb OR if one day has elapsed
# * save rotated logs into a gzipped timestamped backup
# * log file timestamp (controlled by 'dateformat') includes seconds too.
t
his
# * log file timestamp (controlled by 'dateformat') includes seconds too.
T
his
# ensures that logrotate can generate unique logfiles during each rotation
# (otherwise it skips rotation if 'maxsize' is reached multiple times in a
# day).
...
...
cluster/saltbase/salt/docker/init.sls
View file @
3faa38fc
...
...
@@ -471,7 +471,7 @@ docker:
# is managing Docker restart we should probably just delete this whole thing
# but the kubernetes components use salt 'require' to set up a dag, and that
# complicated and scary to unwind.
# On AWS, we use a trick now...
w
e don't start the docker service through Salt.
# On AWS, we use a trick now...
W
e don't start the docker service through Salt.
# Kubelet or our health checker will start it. But we use service.enabled,
# so we still have a `service: docker` node for our DAG.
{% if grains.cloud is defined and grains.cloud == 'aws' %}
...
...
cluster/ubuntu/util.sh
View file @
3faa38fc
...
...
@@ -58,7 +58,7 @@ function setClusterInfo() {
NODE_IPS
=
"
$NODE_IPS
,
$nodeIP
"
fi
else
echo
"unsupported role for
${
i
}
.
p
lease check"
echo
"unsupported role for
${
i
}
.
P
lease check"
exit
1
fi
...
...
@@ -156,7 +156,7 @@ function verify-cluster() {
verify-master
verify-node
"
$i
"
else
echo
"unsupported role for
${
i
}
.
p
lease check"
echo
"unsupported role for
${
i
}
.
P
lease check"
exit
1
fi
...
...
@@ -978,7 +978,7 @@ function kube-push() {
elif
[[
"
${
roles_array
[
${
ii
}
]
}
"
==
"ai"
]]
;
then
provision-masterandnode
else
echo
"unsupported role for
${
i
}
.
p
lease check"
echo
"unsupported role for
${
i
}
.
P
lease check"
exit
1
fi
((
ii
=
ii+1
))
...
...
cluster/vsphere/util.sh
View file @
3faa38fc
...
...
@@ -220,7 +220,7 @@ function kube-run {
#
# run the command remotely and check if the specific kube artifact is running or not.
# keep checking till the you hit the timeout.
d
efault timeout 300s
# keep checking till the you hit the timeout.
D
efault timeout 300s
#
# Usage:
# kube_check 10.0.0.1 cmd timeout
...
...
@@ -263,7 +263,7 @@ function kube-check {
}
#
# verify if salt master is up.
c
heck 30 times and then echo out bad output and return 0
# verify if salt master is up.
C
heck 30 times and then echo out bad output and return 0
#
# Usage:
# remote-pgrep 10.0.0.1 salt-master
...
...
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