From 437867e3efe164972a013db5fd40b76f0e3454c1 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 30 May 2024 14:46:54 +0200 Subject: [PATCH] Update helm and kubectl versions in LCM and tests Dockerfile Change-Id: I7bd59923485d040ee5ee6d0bd81495f37243f526 Signed-off-by: garciadeblas --- docker/LCM/Dockerfile | 11 +++++------ docker/tests/Dockerfile | 11 ++++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index cfb9735c..fcf3f603 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -42,18 +42,17 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ && rm -rf /var/lib/apt/lists/* # https://kubernetes.io/releases/ -RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/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.28/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list \ - && apt-get update && apt-get install -y kubectl=1.28.2-1.1 +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 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.11.3-linux-amd64.tar.gz --output helm-v3.11.3.tar.gz \ - && tar -zxvf helm-v3.11.3.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/ diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 3b5aae09..de900613 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -64,13 +64,18 @@ RUN pip3 install \ -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \ -r /usr/share/osm-tests/requirements.txt -# Google Cloud CLI and kubectl +# kubectl +# https://kubernetes.io/releases/ +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 + +# Google Cloud CLI RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - google-cloud-cli=455.* \ - kubectl=1.28.* + google-cloud-cli=455.* # Azure CLI RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash -- 2.25.1