Skip to content

Add oc client binary to microshift-aio, set KUBECONFIG #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fzdarsky merged 2 commits into from
Dec 6, 2021
Merged

Add oc client binary to microshift-aio, set KUBECONFIG #481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36826f5
Add oc client binary to microshift-aio
sallyom Dec 3, 2021
4a2abe7
set KUBECONFIG within microshift-aio image
sallyom Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packaging/images/microshift-aio/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ COPY $BUILD_PATH/unit /usr/lib/systemd/system/microshift.service
COPY $BUILD_PATH/kubelet-cgroups.conf /etc/systemd/system.conf.d/kubelet-cgroups.conf
COPY $BUILD_PATH/crio-bridge.conf /etc/cni/net.d/100-crio-bridge.conf

RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$ARCH/kubectl" && \
chmod +x ./kubectl && \
mv ./kubectl /usr/local/bin/kubectl
RUN export OCP_VERSION=4.8.9 && \
curl -o oc.tar.gz https://mirror2.openshift.com/pub/openshift-v4/amd64/clients/ocp/$OCP_VERSION/openshift-client-linux-$OCP_VERSION.tar.gz && \
tar -xzvf oc.tar.gz && \
rm oc.tar.gz && \
install -t /usr/local/bin {kubectl,oc}

RUN chmod 755 /usr/local/bin/microshift
RUN export VERSION=1.20 && \
Expand All @@ -62,6 +64,8 @@ RUN sed -i 's|/usr/libexec/crio/conmon|/usr/bin/conmon|' /etc/crio/crio.conf &&
systemctl enable microshift.service && \
systemctl enable crio

ENV KUBECONFIG=/var/lib/microshift/resources/kubeadmin/kubeconfig

# rhel7 hosts, or hosts with legacy iptables need the specific iptables binaries, ubi8 comes with iptables-nft translator

RUN if [ "$HOST" == "rhel7" ] || [ "$IPTABLES" != "nft" ]; then \
Expand Down