Skip to content

Commit 9093ae4

Browse files
committed
add python3-libselinux to container for kubespray selinux support
clone kubespray from master to add fedora 35 support early
1 parent 7962952 commit 9093ae4

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

containers/kubespray/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ ARG DNF_LIST="\
1717
python3-pip \
1818
openssh-clients \
1919
coreutils-single \
20+
libselinux-python3 \
2021
glibc-minimal-langpack \
2122
"
2223

2324
ARG PIP_LIST="\
2425
k8s \
26+
selinux \
2527
passlib \
2628
ansible \
2729
kubernetes \
@@ -76,10 +78,13 @@ RUN set -ex \
7678

7779
RUN set -ex \
7880
&& export RELEASE=$(curl -s https://api.github.com/repos/kubernetes-sigs/kubespray/releases/latest | awk -F '["v,]' '/tag_name/{print $5}') \
79-
&& git clone https://github.com/kubernetes-sigs/kubespray.git --branch v${RELEASE} ${BUILD_PATH}/root/kubespray \
81+
&& git clone https://github.com/kubernetes-sigs/kubespray.git ${BUILD_PATH}/root/kubespray \
8082
&& chmod +x ${BUILD_PATH}/root/kubespray/contrib/inventory_builder/inventory.py \
8183
&& echo
8284

85+
# Disable tagged git clone temporarily to gain fedora 35 support before release
86+
# && git clone https://github.com/kubernetes-sigs/kubespray.git --branch v${RELEASE} ${BUILD_PATH}/root/kubespray \
87+
8388
#################################################################################
8489
# Create image from rootfs
8590
FROM scratch
@@ -114,4 +119,4 @@ LABEL \
114119
io.k8s.display-name="ubi:minimal" \
115120
summary="Minimal Base Image | Red Hat UBI Supportable Image" \
116121
description="Minimal Base Image | Red Hat UBI Supportable Image" \
117-
io.k8s.description="Minimal Base Image | Red Hat UBI Supportable Image"
122+
io.k8s.description="Minimal Base Image | Red Hat UBI Supportable Image"

0 commit comments

Comments
 (0)