buildchain,images: Move salt-master base image to Rocky 8 minimal

scality · Nov 12, 2024 · 2b343ec · 2b343ec
1 parent c5ce0bb
commit 2b343ec
Show file tree

Hide file tree

Showing 6 changed files with 414 additions and 363 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,6 +76,9 @@
 - Move metalk8s-utils image to Rocky 9 minimal
   (PR[#4472](https://github.com/scality/metalk8s/pull/4472))
 
+- Move salt-master image to Rocky 8 minimal
+  (PR[#4474](https://github.com/scality/metalk8s/pull/4474))
+
 ## Release 128.0.1 (in development)
 
 ## Release 128.0.0

diff --git a/buildchain/buildchain/image.py b/buildchain/buildchain/image.py
@@ -261,7 +261,7 @@ def _local_image(name: str, **kwargs: Any) -> targets.LocalImage:
         name="salt-master",
         build_args={
             "BASE_IMAGE": versions.ROCKY_BASE_IMAGE,
-            "BASE_IMAGE_SHA256": versions.ROCKY_BASE_IMAGE_SHA256,
+            "BASE_IMAGE_SHA256": versions.ROCKY_BASE_IMAGE_8_SHA256,
             "SALT_VERSION": versions.SALT_VERSION,
         },
     ),

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -71,9 +71,9 @@ def load_version_information() -> None:
 # Container images {{{
 
 ROCKY_BASE_IMAGE: str = "docker.io/rockylinux/rockylinux"
-ROCKY_BASE_IMAGE_SHA256: str = (
-    # rockylinux:8.10
-    "e8a49c5403b687db05d4d67333fa45808fbe74f36e683cec7abb1f7d0f2338c6"
+ROCKY_BASE_IMAGE_8_SHA256: str = (
+    # rockylinux:8.10-minimal
+    "6d2ede107b4f005a638728711dae05d5fbbfd8abd521cecf5ab61196b361c965"
 )
 ROCKY_BASE_IMAGE_9_SHA256: str = (
     # rockylinux:9.4-minimal

diff --git a/images/salt-master/Dockerfile b/images/salt-master/Dockerfile
@@ -1,6 +1,6 @@
 # SHA256 digest of the base image
 ARG BASE_IMAGE_SHA256
-ARG BASE_IMAGE=docker.io/rockylinux
+ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE}@sha256:${BASE_IMAGE_SHA256}
 
@@ -12,19 +12,16 @@ RUN printf "[saltstack-repo]\n\
 name=Scality SaltStack repo for RHEL/CentOS \$releasever\n\
 baseurl=https://downloads.scality.com/repository/redhat/\$releasever/saltstack/%s\n\
 enabled=1\n\
-gpgcheck=0\n" ${SALT_VERSION} ${SALT_VERSION} >/etc/yum.repos.d/saltstack.repo \
- && dnf clean expire-cache \
- && dnf update -y \
- && dnf install -y glibc-all-langpacks langpacks-en \
- && dnf install -y epel-release \
- && dnf install -y python3-pip \
- && pip3 install "pip == 20.1" \
- && pip3 install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" \
- && dnf install -y git \
- && pip3 install "git+https://github.com/kubernetes-client/python.git@cef5e9bd10a6d5ca4d9c83da46ccfe2114cdaaf8#egg=kubernetes" \
- && dnf remove -y git \
- && dnf install -y salt-master salt-api salt-ssh openssh-clients procps-ng \
- && dnf clean all
+gpgcheck=1\n\
+gpgkey=https://downloads.scality.com/repository/redhat/\$releasever/saltstack/%s/SALTSTACK-GPG-KEY.pub\n" ${SALT_VERSION} ${SALT_VERSION} >/etc/yum.repos.d/saltstack.repo \
+ && microdnf clean all \
+ && microdnf update -y \
+ && microdnf install -y glibc-all-langpacks langpacks-en python3-pip epel-release \
+ && pip3 install "pip == 21.3.1" \
+ && pip3 install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" "kubernetes ~= 12.0.1" \
+ && microdnf install -y salt-master salt-api salt-ssh openssh-clients procps-ng \
+ && microdnf remove -y epel-release \
+ && microdnf clean all
 
 # Set up locale
 ENV LC_ALL=en_US.UTF-8

diff --git a/salt/tests/requirements.in b/salt/tests/requirements.in
@@ -4,7 +4,7 @@ salt == 3002.9
 mock == 3.0.5
 parameterized == 0.7.4
 etcd3 != 0.11.0
-kubernetes == 18.20.0
+kubernetes == 12.0.1
 urllib3
 pyfakefs
 psutil