From cda865d1ef4ce82cade884533b072ad7de4e50da Mon Sep 17 00:00:00 2001 From: Fabio Bertinatto Date: Fri, 29 Nov 2024 09:06:10 -0300 Subject: [PATCH] Update etcd to match k8s 1.32 --- ci_images/rhel-8/ci-openshift-build-root/Dockerfile | 2 +- ci_images/rhel-9/ci-openshift-build-root/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile index dd43532a93..9c4303c760 100644 --- a/ci_images/rhel-8/ci-openshift-build-root/Dockerfile +++ b/ci_images/rhel-8/ci-openshift-build-root/Dockerfile @@ -30,7 +30,7 @@ RUN set -euxo pipefail && \ chmod +x /tmp/*.sh && \ export SSL_CERT_FILE=`test -f /tmp/tls-ca-bundle.pem && echo /tmp/tls-ca-bundle.pem || echo /tmp/Current-IT-Root-CAs.pem` && cat $SSL_CERT_FILE && \ /tmp/install_protoc.sh "23.4" && \ - /tmp/install_etcd.sh "3.5.10" + /tmp/install_etcd.sh "3.5.16" RUN INSTALL_PKGS="glibc libatomic libsemanage annobin go-srpm-macros libstdc++ llvm-libs qt5-srpm-macros redhat-rpm-config bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build" && \ dnf install -y --nobest $INSTALL_PKGS && \ diff --git a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile index c2875be193..b1a72509d2 100644 --- a/ci_images/rhel-9/ci-openshift-build-root/Dockerfile +++ b/ci_images/rhel-9/ci-openshift-build-root/Dockerfile @@ -30,7 +30,7 @@ RUN set -euxo pipefail && \ chmod +x /tmp/*.sh && \ export SSL_CERT_FILE=`test -f /tmp/tls-ca-bundle.pem && echo /tmp/tls-ca-bundle.pem || echo /tmp/Current-IT-Root-CAs.pem` && cat $SSL_CERT_FILE && \ /tmp/install_protoc.sh "23.4" && \ - /tmp/install_etcd.sh "3.5.10" + /tmp/install_etcd.sh "3.5.16" RUN INSTALL_PKGS="glibc libatomic libsemanage annobin go-srpm-macros kernel-srpm-macros libstdc++ llvm-libs qt5-srpm-macros redhat-rpm-config bc procps-ng util-linux bind-utils bsdtar createrepo_c device-mapper device-mapper-persistent-data e2fsprogs ethtool file findutils gcc git glib2-devel gpgme gpgme-devel hostname iptables jq krb5-devel libassuan libassuan-devel libseccomp-devel lsof make nmap-ncat openssl rsync socat systemd-devel tar tree wget which xfsprogs zip goversioninfo gettext python3 iproute rpm-build rpmdevtools selinux-policy-devel" && \ dnf install -y --nobest $INSTALL_PKGS && \