projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove helm2 client from LCM Dockerfile
[osm/devops.git]
/
docker
/
LCM
/
Dockerfile
diff --git
a/docker/LCM/Dockerfile
b/docker/LCM/Dockerfile
index
fcf3f60
..
2a90f6b
100644
(file)
--- a/
docker/LCM/Dockerfile
+++ b/
docker/LCM/Dockerfile
@@
-46,10
+46,6
@@
RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | gpg --d
&& 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
&& 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 \
# 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 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
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
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_HOST kafka
ENV OSMLCM_MESSAGE_PORT 9092
# k8s
ENV OSMLCM_MESSAGE_PORT 9092
# k8s
-ENV OSMLCM_VCA_HELMPATH /usr/local/bin/helm
+ENV OSMLCM_VCA_HELMPATH /usr/local/bin/helm
3
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju