use standard unix path to crictl and remove unnecessary version env var

Signed-off-by: Kate Goldenring <kate.goldenring@microsoft.com>
project-akri · Nov 15, 2021 · 60743e4 · 60743e4
1 parent db9270e
commit 60743e4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/build/containers/Dockerfile.agent b/build/containers/Dockerfile.agent
@@ -14,8 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev open
 COPY ./target/${CROSS_BUILD_TARGET}/${BUILD_TYPE}/agent /agent
 
 # Install crictl
-RUN VERSION="v1.17.0" && \
-    curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.17.0/crictl-v1.17.0-linux-amd64.tar.gz --output crictl-v1.17.0-linux-amd64.tar.gz &&\
+RUN curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.17.0/crictl-v1.17.0-linux-amd64.tar.gz --output crictl-v1.17.0-linux-amd64.tar.gz &&\
     tar zxvf crictl-v1.17.0-linux-amd64.tar.gz -C /usr/local/bin && \
     rm -f crictl-v1.17.0-linux-amd64.tar.gz && \
     apt-get remove -y curl ca-certificates && apt-get clean

diff --git a/build/containers/Dockerfile.agent-full b/build/containers/Dockerfile.agent-full
@@ -12,8 +12,7 @@ LABEL org.opencontainers.image.source https://github.com/project-akri/akri
 RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev openssl curl ca-certificates && apt-get clean
 
 # Install crictl
-RUN VERSION="v1.17.0" && \
-    curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.17.0/crictl-v1.17.0-linux-amd64.tar.gz --output crictl-v1.17.0-linux-amd64.tar.gz &&\
+RUN curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.17.0/crictl-v1.17.0-linux-amd64.tar.gz --output crictl-v1.17.0-linux-amd64.tar.gz &&\
     tar zxvf crictl-v1.17.0-linux-amd64.tar.gz -C /usr/local/bin && \
     rm -f crictl-v1.17.0-linux-amd64.tar.gz && \
     apt-get remove -y curl ca-certificates && apt-get clean

diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml
@@ -63,7 +63,7 @@ spec:
             value: {{ .Values.debugEcho.configuration.shared | quote }}
           {{- end }}
           - name: HOST_CRICTL_PATH
-            value: unix:///usr/local/bin/crictl
+            value: /usr/local/bin/crictl
           - name: HOST_RUNTIME_ENDPOINT
             value: unix:///host/var/run/dockershim.sock
           - name: HOST_IMAGE_ENDPOINT