commit 09bc8096f82146667d8c4078771691adc6df81fb
author garciadeblas <gerardo.garciadeblas@telefonica.com> Thu May 30 22:35:30 2024 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Thu May 30 22:37:53 2024 +0200
tree 1630e74581bdae0705d2db705b741ed7e7e7c6ec
parent 437867e3efe164972a013db5fd40b76f0e3454c1

Remove helm2 client from LCM Dockerfile

Change-Id: I5765825625bda3357723082d3f3eeb91fce19208
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

docker/LCM/Dockerfile

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index fcf3f60..2a90f6b 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -46,10 +46,6 @@
     && echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list \
     && apt-get update && apt-get install -y kubectl=1.30.1-1.1
 
-RUN curl https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz --output helm-v2.17.0.tar.gz \
-    && tar -zxvf helm-v2.17.0.tar.gz \
-    && mv linux-amd64/helm /usr/local/bin/helm \
-    && rm -r linux-amd64/
 # https://github.com/helm/helm/releases
 RUN curl https://get.helm.sh/helm-v3.15.1-linux-amd64.tar.gz --output helm-v3.15.1.tar.gz \
     && tar -zxvf helm-v3.15.1.tar.gz \
@@ -102,7 +98,6 @@
 RUN rm -f /etc/apt/apt.conf.d/proxy.conf
 
 COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
-COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
 COPY --from=INSTALL /usr/local/bin/helm3 /usr/local/bin/helm3
 COPY --from=INSTALL /usr/bin/scp /usr/bin/scp
 COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
@@ -160,7 +155,7 @@
 ENV OSMLCM_MESSAGE_PORT    9092
 
 # k8s
-ENV OSMLCM_VCA_HELMPATH    /usr/local/bin/helm
+ENV OSMLCM_VCA_HELMPATH    /usr/local/bin/helm3
 ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
 ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju