Merge pull request ansible#10002 from shanemcd/goodbye-binaries

Stop installing kubectl/oc Realized this when looking at ansible#9428 Reviewed-by: Chris Meyers <None> Reviewed-by: Christian Adams <[email protected]>
kivra-sweden · Apr 23, 2021 · eb648d9 · eb648d9
2 parents 8e579b2 + 146fb72
commit eb648d9
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -107,10 +107,6 @@ RUN dnf -y update && \
     dnf -y install centos-release-stream && dnf -y install "rsyslog >= 8.1911.0" && dnf -y remove centos-release-stream && \
     dnf -y clean all
 
-# Install kubectl
-RUN curl -L -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.17.8/bin/linux/{{ kubectl_architecture | default('amd64') }}/kubectl && \
-    chmod a+x /usr/bin/kubectl
-
 RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 && \
     chmod 700 get_helm.sh && \
     ./get_helm.sh
@@ -123,11 +119,6 @@ RUN python3.8 -m ensurepip && pip3 install "virtualenv < 20" supervisor
 
 RUN rm -rf /root/.cache && rm -rf /tmp/*
 
-# Install OpenShift CLI
-RUN cd /usr/local/bin && \
-    curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz | \
-    tar -xz --strip-components=1 --wildcards --no-anchored 'oc'
-
 {% if (build_dev|bool) or (kube_dev|bool) %}
 # Install development/test requirements
 RUN dnf -y install \