Merge pull request #66877 from Random-Liu/crictl-yaml-for-preload

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Generate crictl config for preload as well. Generate `/etc/crictl.yaml` also when crictl is preloaded. Signed-off-by: Lantao Liu <lantaol@google.com> **Release note**: ```release-note Fix a bug on GCE that /etc/crictl.yaml is not generated when crictl is preloaded. ```

Merge pull request #66877 from Random-Liu/crictl-yaml-for-preload
cd31266e · Kubernetes Submit Queue · GitHub · 60614d5c · 7dc1e9af · cd31266e
Unverified Commit cd31266e authored Aug 01, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 01, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

configure.sh cluster/gce/gci/configure.sh +5 -5

No files found.
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -247,6 +247,11 @@ function install-crictl {
  fi
  local -r crictl="crictl-${crictl_version}-linux-amd64"

+  # Create crictl config file.
+  cat > /etc/crictl.yaml <<EOF
+runtime-endpoint: ${CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/dockershim.sock}
+EOF
+
  if is-preloaded "${crictl}" "${crictl_sha1}"; then
    echo "crictl is preloaded"
    return
@@ -257,11 +262,6 @@ function install-crictl {
  download-or-bust "${crictl_sha1}" "${crictl_path}/${crictl}"
  mv "${KUBE_HOME}/${crictl}" "${KUBE_BIN}/crictl"
  chmod a+x "${KUBE_BIN}/crictl"
-
-  # Create crictl config file.
-  cat > /etc/crictl.yaml <<EOF
-runtime-endpoint: ${CONTAINER_RUNTIME_ENDPOINT:-unix:///var/run/dockershim.sock}
-EOF
 }

 function install-exec-auth-plugin {