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
ed88a039
Commit
ed88a039
authored
Sep 16, 2016
by
Wojciech Tyczynski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend logs for debugging upgrade test failures
parent
15344153
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
common.sh
cluster/common.sh
+2
-2
upgrade.sh
cluster/gce/upgrade.sh
+2
-0
No files found.
cluster/common.sh
View file @
ed88a039
...
@@ -353,13 +353,13 @@ function tars_from_version() {
...
@@ -353,13 +353,13 @@ function tars_from_version() {
SALT_TAR_URL
=
"https://storage.googleapis.com/kubernetes-release/release/
${
KUBE_VERSION
}
/kubernetes-salt.tar.gz"
SALT_TAR_URL
=
"https://storage.googleapis.com/kubernetes-release/release/
${
KUBE_VERSION
}
/kubernetes-salt.tar.gz"
# TODO: Clean this up.
# TODO: Clean this up.
KUBE_MANIFESTS_TAR_URL
=
"
${
SERVER_BINARY_TAR_URL
/server-linux-amd64/manifests
}
"
KUBE_MANIFESTS_TAR_URL
=
"
${
SERVER_BINARY_TAR_URL
/server-linux-amd64/manifests
}
"
KUBE_MANIFESTS_TAR_HASH
=
$(
curl
${
KUBE_MANIFESTS_TAR_URL
}
|
sha1sum
|
awk
'{print $1}'
)
KUBE_MANIFESTS_TAR_HASH
=
$(
curl
${
KUBE_MANIFESTS_TAR_URL
}
2>/dev/null
|
sha1sum
|
awk
'{print $1}'
)
elif
[[
${
KUBE_VERSION
}
=
~
${
KUBE_CI_VERSION_REGEX
}
]]
;
then
elif
[[
${
KUBE_VERSION
}
=
~
${
KUBE_CI_VERSION_REGEX
}
]]
;
then
SERVER_BINARY_TAR_URL
=
"https://storage.googleapis.com/kubernetes-release-dev/ci/
${
KUBE_VERSION
}
/kubernetes-server-linux-amd64.tar.gz"
SERVER_BINARY_TAR_URL
=
"https://storage.googleapis.com/kubernetes-release-dev/ci/
${
KUBE_VERSION
}
/kubernetes-server-linux-amd64.tar.gz"
SALT_TAR_URL
=
"https://storage.googleapis.com/kubernetes-release-dev/ci/
${
KUBE_VERSION
}
/kubernetes-salt.tar.gz"
SALT_TAR_URL
=
"https://storage.googleapis.com/kubernetes-release-dev/ci/
${
KUBE_VERSION
}
/kubernetes-salt.tar.gz"
# TODO: Clean this up.
# TODO: Clean this up.
KUBE_MANIFESTS_TAR_URL
=
"
${
SERVER_BINARY_TAR_URL
/server-linux-amd64/manifests
}
"
KUBE_MANIFESTS_TAR_URL
=
"
${
SERVER_BINARY_TAR_URL
/server-linux-amd64/manifests
}
"
KUBE_MANIFESTS_TAR_HASH
=
$(
curl
${
KUBE_MANIFESTS_TAR_URL
}
|
sha1sum
|
awk
'{print $1}'
)
KUBE_MANIFESTS_TAR_HASH
=
$(
curl
${
KUBE_MANIFESTS_TAR_URL
}
2>/dev/null
|
sha1sum
|
awk
'{print $1}'
)
else
else
echo
"Version doesn't match regexp"
>
&2
echo
"Version doesn't match regexp"
>
&2
exit
1
exit
1
...
...
cluster/gce/upgrade.sh
View file @
ed88a039
...
@@ -246,6 +246,7 @@ function do-node-upgrade() {
...
@@ -246,6 +246,7 @@ function do-node-upgrade() {
--zones
=
"
${
ZONE
}
"
\
--zones
=
"
${
ZONE
}
"
\
--regexp
=
"
${
group
}
"
\
--regexp
=
"
${
group
}
"
\
--format
=
'value(instanceTemplate)'
||
true
)
)
--format
=
'value(instanceTemplate)'
||
true
)
)
echo
"== Calling rolling-update for
${
group
}
. =="
>
&2
update
=
$(
gcloud alpha compute rolling-updates
\
update
=
$(
gcloud alpha compute rolling-updates
\
--project
=
"
${
PROJECT
}
"
\
--project
=
"
${
PROJECT
}
"
\
--zone
=
"
${
ZONE
}
"
\
--zone
=
"
${
ZONE
}
"
\
...
@@ -260,6 +261,7 @@ function do-node-upgrade() {
...
@@ -260,6 +261,7 @@ function do-node-upgrade() {
updates+
=(
"
${
id
}
"
)
updates+
=(
"
${
id
}
"
)
done
done
echo
"== Waiting for Upgrading nodes to be finished. =="
>
&2
# Wait until rolling updates are finished.
# Wait until rolling updates are finished.
for
update
in
${
updates
[@]
}
;
do
for
update
in
${
updates
[@]
}
;
do
while
true
;
do
while
true
;
do
...
...
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