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
1c412114
Commit
1c412114
authored
Aug 31, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cluster: delete some kube-push remanents
parent
2548fb08
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
85 deletions
+1
-85
util.sh
cluster/gce/util.sh
+1
-70
util.sh
cluster/skeleton/util.sh
+0
-15
No files found.
cluster/gce/util.sh
View file @
1c412114
...
...
@@ -1616,7 +1616,7 @@ function validate-node-local-ssds-ext(){
ssdopts
=
"
${
1
}
"
if
[[
-z
"
${
ssdopts
[0]
}
"
||
-z
"
${
ssdopts
[1]
}
"
||
-z
"
${
ssdopts
[2]
}
"
]]
;
then
echo
-e
"
${
color_red
}
Local SSD: NODE_LOCAL_SSDS_EXT is malformed, found
${
ssdopts
[0]-_
}
,
${
ssdopts
[1]-_
}
,
${
ssdopts
[2]-_
}
${
color_norm
}
"
>
&2
echo
-e
"
${
color_red
}
Local SSD: NODE_LOCAL_SSDS_EXT is malformed, found
${
ssdopts
[0]-_
}
,
${
ssdopts
[1]-_
}
,
${
ssdopts
[2]-_
}
${
color_norm
}
"
>
&2
exit
2
fi
if
[[
"
${
ssdopts
[1]
}
"
!=
"scsi"
&&
"
${
ssdopts
[1]
}
"
!=
"nvme"
]]
;
then
...
...
@@ -2963,75 +2963,6 @@ function check-resources() {
return
0
}
# Prepare to push new binaries to kubernetes cluster
# $1 - whether prepare push to node
function
prepare-push
()
{
local
node
=
"
${
1
-
}
"
#TODO(dawnchen): figure out how to upgrade a Container Linux node
if
[[
"
${
node
}
"
==
"true"
&&
"
${
NODE_OS_DISTRIBUTION
}
"
!=
"debian"
]]
;
then
echo
"Updating nodes in a kubernetes cluster with
${
NODE_OS_DISTRIBUTION
}
is not supported yet."
>
&2
exit
1
fi
if
[[
"
${
node
}
"
!=
"true"
&&
"
${
MASTER_OS_DISTRIBUTION
}
"
!=
"debian"
]]
;
then
echo
"Updating the master in a kubernetes cluster with
${
MASTER_OS_DISTRIBUTION
}
is not supported yet."
>
&2
exit
1
fi
OUTPUT
=
${
KUBE_ROOT
}
/_output/logs
mkdir
-p
${
OUTPUT
}
kube::util::ensure-temp-dir
detect-project
detect-master
detect-node-names
get-kubeconfig-basicauth
get-kubeconfig-bearertoken
# Make sure we have the tar files staged on Google Storage
tars_from_version
# Prepare node env vars and update MIG template
if
[[
"
${
node
}
"
==
"true"
]]
;
then
write-node-env
local
scope_flags
=
$(
get-scope-flags
)
# Ugly hack: Since it is not possible to delete instance-template that is currently
# being used, create a temp one, then delete the old one and recreate it once again.
local
tmp_template_name
=
"
${
NODE_INSTANCE_PREFIX
}
-template-tmp"
create-node-instance-template
$tmp_template_name
local
template_name
=
"
${
NODE_INSTANCE_PREFIX
}
-template"
for
group
in
${
INSTANCE_GROUPS
[@]
:-}
;
do
gcloud compute instance-groups managed
\
set-instance-template
"
${
group
}
"
\
--template
"
$tmp_template_name
"
\
--zone
"
${
ZONE
}
"
\
--project
"
${
PROJECT
}
"
||
true
;
done
gcloud compute instance-templates delete
\
--project
"
${
PROJECT
}
"
\
--quiet
\
"
$template_name
"
||
true
create-node-instance-template
"
$template_name
"
for
group
in
${
INSTANCE_GROUPS
[@]
:-}
;
do
gcloud compute instance-groups managed
\
set-instance-template
"
${
group
}
"
\
--template
"
$template_name
"
\
--zone
"
${
ZONE
}
"
\
--project
"
${
PROJECT
}
"
||
true
;
done
gcloud compute instance-templates delete
\
--project
"
${
PROJECT
}
"
\
--quiet
\
"
$tmp_template_name
"
||
true
fi
}
# -----------------------------------------------------------------------------
# Cluster specific test helpers used from hack/e2e.go
...
...
cluster/skeleton/util.sh
View file @
1c412114
...
...
@@ -55,21 +55,6 @@ function kube-down {
echo
"Skeleton Provider: kube-down not implemented"
1>&2
}
# Prepare update a kubernetes component
function
prepare-push
{
echo
"Skeleton Provider: prepare-push not implemented"
1>&2
}
# Update a kubernetes master
function
push-master
{
echo
"Skeleton Provider: push-master not implemented"
1>&2
}
# Update a kubernetes node
function
push-node
{
echo
"Skeleton Provider: push-node not implemented"
1>&2
}
# Execute prior to running tests to build a release if required for env
function
test-build-release
{
echo
"Skeleton Provider: test-build-release not implemented"
1>&2
...
...
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