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

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

Browse Source 
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.
```
This commit is contained in:
Kubernetes Submit Queue 2018-08-01 22:32:58 -07:00 committed by GitHub
commit cd31266e62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/gce/gci/configure.sh
View File

@ -247,6 +247,11 @@ function install-crictl {
fi fi
local -r crictl="crictl-${crictl_version}-linux-amd64" 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 if is-preloaded "${crictl}" "${crictl_sha1}"; then
echo "crictl is preloaded" echo "crictl is preloaded"
return return
@ -257,11 +262,6 @@ function install-crictl {
download-or-bust "${crictl_sha1}" "${crictl_path}/${crictl}" download-or-bust "${crictl_sha1}" "${crictl_path}/${crictl}"
mv "${KUBE_HOME}/${crictl}" "${KUBE_BIN}/crictl" mv "${KUBE_HOME}/${crictl}" "${KUBE_BIN}/crictl"
chmod a+x "${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 { function install-exec-auth-plugin {