Skip to content

Commit 09d40a7

Browse files
authored
* upgrade helm to 3.19.0 * update test docker to debian11 * add cryptography>=44.0.1 version to fix CVE-2024-12797, and rollback k8s to 1.31 due to no 1.32 or 1.33 under kubernetes-release gcs
1 parent 0f916e7 commit 09d40a7

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

marketplace/deployer_envsubst_base/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@ RUN pip3 install \
1515
wheel \
1616
pyOpenSSL \
1717
pyyaml \
18-
six
18+
six \
19+
cryptography>=44.0.1
1920

20-
RUN for full_version in 1.33.5 1.34.0; \
21+
RUN for full_version in 1.30.4 1.31.0; \
2122
do \
2223
version=${full_version%.*} \
2324
&& mkdir -p /opt/kubectl/$version \
2425
&& wget -q -O /opt/kubectl/$version/kubectl \
2526
https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \
2627
&& chmod 755 /opt/kubectl/$version/kubectl; \
2728
done;
28-
RUN ln -s /opt/kubectl/1.33 /opt/kubectl/default
29+
RUN ln -s /opt/kubectl/1.31 /opt/kubectl/default
2930

3031
COPY marketplace/deployer_envsubst_base/* /bin/
3132
COPY marketplace/deployer_util/* /bin/

marketplace/deployer_helm_base/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
RUN pip3 install \
1515
wheel \
1616
pyOpenSSL \
17-
pyyaml
17+
pyyaml \
18+
cryptography>=44.0.1
1819

19-
RUN for full_version in 1.33.5 1.34.0; \
20+
RUN for full_version in 1.30.4 1.31.0; \
2021
do \
2122
version=${full_version%.*} \
2223
&& mkdir -p /opt/kubectl/$version \
2324
&& wget -q -O /opt/kubectl/$version/kubectl \
2425
https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \
2526
&& chmod 755 /opt/kubectl/$version/kubectl; \
2627
done;
27-
RUN ln -s /opt/kubectl/1.33 /opt/kubectl/default
28+
RUN ln -s /opt/kubectl/1.31 /opt/kubectl/default
2829

2930
RUN mkdir -p /bin/helm-downloaded \
3031
&& wget -q -O /bin/helm-downloaded/helm.tar.gz \

marketplace/dev/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c
2323
RUN pip3 install \
2424
wheel \
2525
pyOpenSSL \
26-
pyyaml
26+
pyyaml \
27+
cryptography>=44.0.1
2728

28-
RUN for full_version in 1.33.5 1.34.0; \
29+
RUN for full_version in 1.30.4 1.31.0; \
2930
do \
3031
version=${full_version%.*} \
3132
&& mkdir -p /opt/kubectl/$version \
3233
&& wget -q -O /opt/kubectl/$version/kubectl \
3334
https://storage.googleapis.com/kubernetes-release/release/v$full_version/bin/linux/amd64/kubectl \
3435
&& chmod 755 /opt/kubectl/$version/kubectl; \
3536
done;
36-
RUN ln -s /opt/kubectl/1.33 /opt/kubectl/default
37+
RUN ln -s /opt/kubectl/1.31 /opt/kubectl/default
3738

3839
RUN echo "deb [signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list \
3940
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key --keyring /usr/share/keyrings/docker.gpg add - \

0 commit comments

Comments
 (0)