X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=2a90f6bc99f98580bc07031a5c0d304c3909c16d;hb=09bc8096f82146667d8c4078771691adc6df81fb;hp=a0a093559a2fdec6ccd24fdb39e8551a5bdf7a84;hpb=02feb8ef9ae5f545a111759cbbe9f01b1741cc85;p=osm%2Fdevops.git

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index a0a09355..2a90f6bc 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     curl=7.81.* \
     && rm -rf /var/lib/apt/lists/*
 
-########### End of common prepration
+########### End of common preparation
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -42,18 +42,13 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     && rm -rf /var/lib/apt/lists/*
 
 # https://kubernetes.io/releases/
-RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
-    && echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
-    && apt-get update && apt-get install -y kubectl=1.23.3-00
-
-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/
+RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg \
+    && 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
 
 # https://github.com/helm/helm/releases
-RUN curl https://get.helm.sh/helm-v3.7.2-linux-amd64.tar.gz --output helm-v3.7.2.tar.gz \
-    && tar -zxvf helm-v3.7.2.tar.gz \
+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 \
     && mv linux-amd64/helm /usr/local/bin/helm3 \
     && rm -r linux-amd64/
 
@@ -93,7 +88,7 @@ COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-package
 COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages  /usr/local/lib/python3.10/dist-packages
 
 #######################################################################################
-# End of common prepration
+# End of common preparation
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
@@ -103,7 +98,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
 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
@@ -161,7 +155,7 @@ ENV OSMLCM_MESSAGE_HOST    kafka
 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