mirror of https://github.com/k3s-io/k3s
Merge pull request #29249 from aveshagarwal/master-node-e2e-configmap-selinux-fix
Automatic merge from submit-queue Fix ConfigMap related node e2e tests on selinux enabled systems One selinux enabled systems, it might require to relabel /var/lib/kubelet, otherwise following tests fail: Summarizing 7 Failures: ``` [Fail] [k8s.io] ConfigMap [It] updates should be reflected in volume [Conformance] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e_node/configmap.go:131 [Fail] [k8s.io] ConfigMap [It] should be consumable from pods in volume as non-root with FSGroup [Feature:FSGroup] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e/framework/util.go:2115 [Fail] [k8s.io] ConfigMap [It] should be consumable from pods in volume with mappings as non-root [Conformance] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e/framework/util.go:2115 [Fail] [k8s.io] ConfigMap [It] should be consumable from pods in volumpe [Conformance] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e/framework/util.go:2115 [Fail] [k8s.io] ConfigMap [It] should be consumable from pods in volume with mappings [Conformance] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e/framework/util.go:2115 [Fail] [k8s.io] ConfigMap [It] should be consumable from pods in volume with mappings as non-root with FSGroup [Feature:FSGroup] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e/framework/util.go:2115 [Fail] [k8s.io] ConfigMap [It] should be consumable from pods in volume as non-root [Conformance] /root/upstream-code/gocode/src/k8s.io/kubernetes/test/e2e/framework/util.go:2115 ``` @kubernetes/rh-cluster-infrapull/6/head
commit
9045dfef8f
|
@ -132,6 +132,21 @@ else
|
|||
if ! [[ $test_args =~ "--disable-kubenet" ]]; then
|
||||
test_args="$test_args --disable-kubenet=true"
|
||||
fi
|
||||
|
||||
# On selinux enabled systems, it might
|
||||
# require to relabel /var/lib/kubelet
|
||||
if which selinuxenabled &> /dev/null && \
|
||||
selinuxenabled && \
|
||||
which chcon > /dev/null ; then
|
||||
mkdir -p /var/lib/kubelet
|
||||
if [[ ! $(ls -Zd /var/lib/kubelet) =~ svirt_sandbox_file_t ]] ; then
|
||||
echo "Applying SELinux label to /var/lib/kubelet directory."
|
||||
if ! sudo chcon -Rt svirt_sandbox_file_t /var/lib/kubelet; then
|
||||
echo "Failed to apply selinux label to /var/lib/kubelet."
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Test using the host the script was run on
|
||||
# Provided for backwards compatibility
|
||||
"${ginkgo}" --focus=$focus --skip=$skip "${KUBE_ROOT}/test/e2e_node/" --report-dir=${report} \
|
||||
|
|
Loading…
Reference in New Issue