mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #60811 from dims/configure-shared-mount-to-avoid-conformance-test-failure
Automatic merge from submit-queue (batch tested with PRs 60980, 61273, 60811, 61021, 61367). 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>. prevent conformance test failure in DIND scenario **What this PR does / why we need it**: in the "ci-kubernetes-local-e2e" job, we are running local-up-cluster.sh using DIND. We see failure for "HostPath should give a volume the correct mode [Conformance]" test. The failure looks as follows: linux mounts: path /tmp is mounted on / but it is not a shared or slave mount **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: https://github.com/kubernetes/kubernetes/issues/61058#issuecomment-372764783 **Release note**: ```release-note NONE ```
This commit is contained in:
commit
d2cfe8c516
@ -952,6 +952,8 @@ if [[ "${KUBETEST_IN_DOCKER:-}" == "true" ]]; then
|
||||
export PATH="${KUBE_ROOT}/third_party/etcd:${PATH}"
|
||||
KUBE_FASTBUILD=true make ginkgo cross
|
||||
apt install -y sudo
|
||||
# configure shared mounts to prevent failure in DIND scenarios
|
||||
mount --make-rshared /
|
||||
fi
|
||||
|
||||
# validate that etcd is: not running, in path, and has minimum required version.
|
||||
|
Loading…
Reference in New Issue
Block a user