Merge pull request #68143 from shyamjvs/garbage-collect-kubemark-image

Automatic merge from submit-queue (batch tested with PRs 68127, 68143). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. GC kubemark image after cluster starts up Last piece to fix https://github.com/kubernetes/kubernetes/issues/59567 /cc @wojtek-t ```release-note NONE ```

Merge pull request #68143 from shyamjvs/garbage-collect-kubemark-image
1cfeede6 · Kubernetes Submit Queue · GitHub · 6701e24c · 63ce112d · 1cfeede6
Unverified Commit 1cfeede6 authored Sep 03, 2018 by Kubernetes Submit Queue Committed by GitHub Sep 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

util.sh cluster/gce/util.sh +5 -0

config-default.sh cluster/kubemark/gce/config-default.sh +1 -0

start-kubemark.sh test/kubemark/start-kubemark.sh +8 -0

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -3072,3 +3072,8 @@ function ssh-to-node() {
 function prepare-e2e() {
  detect-project
 }
+
+# Delete the image given by $1.
+function delete-image() {
+  gcloud container images delete --quiet "$1"
+}
--- a/cluster/kubemark/gce/config-default.sh
+++ b/cluster/kubemark/gce/config-default.sh
@@ -39,6 +39,7 @@ MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-gci}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-cos-stable-65-10323-64-0}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-cos-cloud}
+CLEANUP_KUBEMARK_IMAGE=${CLEANUP_KUBEMARK_IMAGE:-true}

 # GPUs supported in GCE do not have compatible drivers in Debian 7.
 if [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then

--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -220,6 +220,14 @@ function create-and-upload-hollow-node-image {
    cd $CURR_DIR
  fi
  echo "Created and uploaded the kubemark hollow-node image to docker registry."
+  # Cleanup the kubemark image after the script exits.
+  if [[ "${CLEANUP_KUBEMARK_IMAGE:-}" == "true" ]]; then
+    trap delete-kubemark-image EXIT
+  fi
+}
+
+function delete-kubemark-image {
+  delete-image "${KUBEMARK_IMAGE_REGISTRY}/kubemark:${KUBEMARK_IMAGE_TAG}"
 }

 # Generate secret and configMap for the hollow-node pods to work, prepare