github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Make docker authentication in kubemark provider-independent

Browse Source
This commit is contained in:
Shyam Jeedigunta 2018-07-04 16:27:22 +02:00
parent e1bdc784a0
commit 69090f0ad2
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/kubemark/gce/util.sh
View File

@ -25,6 +25,12 @@ function run-gcloud-compute-with-retries {
run-cmd-with-retries gcloud compute "$@" run-cmd-with-retries gcloud compute "$@"
} }
function authenticate-docker {
echo "Configuring registry authentication"
mkdir -p "${HOME}/.docker"
gcloud beta auth configure-docker -q
}
function create-master-instance-with-resources { function create-master-instance-with-resources {
GCLOUD_COMMON_ARGS="--project ${PROJECT} --zone ${ZONE}" GCLOUD_COMMON_ARGS="--project ${PROJECT} --zone ${ZONE}"

6
test/kubemark/skeleton/util.sh
View File

@ -18,6 +18,12 @@
# Kubermark must implement to use test/kubemark/start-kubemark.sh and # Kubermark must implement to use test/kubemark/start-kubemark.sh and
# test/kubemark/stop-kubemark.sh scripts. # test/kubemark/stop-kubemark.sh scripts.
# This function should authenticate docker to be able to read/write to
# the right container registry (needed for pushing kubemark image).
function authenticate-docker {
echo "Configuring registry authentication" 1>&2
}
# This function should create a machine instance for the master along # This function should create a machine instance for the master along
# with any/all of the following resources: # with any/all of the following resources:
# - Attach a PD to the master (optionally 1 more for storing events) # - Attach a PD to the master (optionally 1 more for storing events)

5
test/kubemark/start-kubemark.sh
View File

@ -190,10 +190,7 @@ function start-master-components {
# Create a docker image for hollow-node and upload it to the appropriate docker registry. # Create a docker image for hollow-node and upload it to the appropriate docker registry.
function create-and-upload-hollow-node-image { function create-and-upload-hollow-node-image {
echo "Configuring registry authentication" authenticate-docker
mkdir -p "${HOME}/.docker"
gcloud beta auth configure-docker -q
KUBEMARK_IMAGE_REGISTRY="${KUBEMARK_IMAGE_REGISTRY:-${CONTAINER_REGISTRY}/${PROJECT}}" KUBEMARK_IMAGE_REGISTRY="${KUBEMARK_IMAGE_REGISTRY:-${CONTAINER_REGISTRY}/${PROJECT}}"
if [[ "${KUBEMARK_BAZEL_BUILD:-}" =~ ^[yY]$ ]]; then if [[ "${KUBEMARK_BAZEL_BUILD:-}" =~ ^[yY]$ ]]; then
# Build+push the image through bazel. # Build+push the image through bazel.