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
4a222b25
Commit
4a222b25
authored
Jan 19, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cluster: delete image staging
parent
02de75fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
50 deletions
+0
-50
common.sh
cluster/common.sh
+0
-45
kube-up.sh
cluster/kube-up.sh
+0
-5
No files found.
cluster/common.sh
View file @
4a222b25
...
...
@@ -407,50 +407,6 @@ function find-release-version() {
fi
}
function
stage-images
()
{
find-release-version
find-release-tars
KUBE_IMAGE_TAG
=
"
$(
echo
"""
${
KUBE_GIT_VERSION
}
"""
|
sed
's/+/-/g'
)
"
local
docker_wrapped_binaries
=(
"kube-apiserver"
"kube-controller-manager"
"kube-scheduler"
"kube-proxy"
)
local
docker_cmd
=(
"docker"
)
if
[[
"
${
KUBE_DOCKER_REGISTRY
}
"
==
"gcr.io/"
*
]]
;
then
local
docker_push_cmd
=(
"gcloud"
"docker"
)
else
local
docker_push_cmd
=(
"
${
docker_cmd
[@]
}
"
)
fi
local
temp_dir
=
"
$(
mktemp
-d
-t
'kube-server-XXXX'
)
"
tar
xzfv
"
${
SERVER_BINARY_TAR
}
"
-C
"
${
temp_dir
}
"
&> /dev/null
for
binary
in
"
${
docker_wrapped_binaries
[@]
}
"
;
do
local
docker_tag
=
"
$(
cat
${
temp_dir
}
/kubernetes/server/bin/
${
binary
}
.docker_tag
)
"
(
"
${
docker_cmd
[@]
}
"
load
-i
"
${
temp_dir
}
/kubernetes/server/bin/
${
binary
}
.tar"
"
${
docker_cmd
[@]
}
"
rmi
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
2>/dev/null
||
true
"
${
docker_cmd
[@]
}
"
tag
"gcr.io/google_containers/
${
binary
}
:
${
docker_tag
}
"
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
"
${
docker_push_cmd
[@]
}
"
push
"
${
KUBE_DOCKER_REGISTRY
}
/
${
binary
}
:
${
KUBE_IMAGE_TAG
}
"
)
&>
"
${
temp_dir
}
/
${
binary
}
-push.log"
&
done
kube::util::wait-for-jobs
||
{
echo
"!!! unable to push images. See
${
temp_dir
}
/*.log for more info."
1>&2
return
1
}
rm
-rf
"
${
temp_dir
}
"
return
0
}
# Quote something appropriate for a yaml string.
#
# TODO(zmerlynn): Note that this function doesn't so much "quote" as
...
...
@@ -584,7 +540,6 @@ NETWORK_POLICY_PROVIDER: $(yaml-quote ${NETWORK_POLICY_PROVIDER:-})
PREPULL_E2E_IMAGES:
$(
yaml-quote
${
PREPULL_E2E_IMAGES
:-})
HAIRPIN_MODE:
$(
yaml-quote
${
HAIRPIN_MODE
:-})
E2E_STORAGE_TEST_ENVIRONMENT:
$(
yaml-quote
${
E2E_STORAGE_TEST_ENVIRONMENT
:-})
KUBE_IMAGE_TAG:
$(
yaml-quote
${
KUBE_IMAGE_TAG
:-})
KUBE_DOCKER_REGISTRY:
$(
yaml-quote
${
KUBE_DOCKER_REGISTRY
:-})
KUBE_ADDON_REGISTRY:
$(
yaml-quote
${
KUBE_ADDON_REGISTRY
:-})
MULTIZONE:
$(
yaml-quote
${
MULTIZONE
:-})
...
...
cluster/kube-up.sh
View file @
4a222b25
...
...
@@ -64,11 +64,6 @@ verify-prereqs
echo
"... calling verify-kube-binaries"
>
&2
verify-kube-binaries
if
[[
"
${
KUBE_STAGE_IMAGES
:-}
"
==
"true"
]]
;
then
echo
"... staging images"
>
&2
stage-images
fi
echo
"... calling kube-up"
>
&2
kube-up
...
...
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