hypercube: Fix autoremove breakage on aarch64

Docker build fails on aarch64 with the following:

/var/tmp/rpm-tmp.CnRLJw: line 1: /usr/sbin/new-kernel-pkg: No such file
or directory
error: %preun(kernel-core-4.18.0-80.7.2.el7.aarch64) scriptlet failed,
exit status 127
Error in PREUN scriptlet in rpm package
kernel-core-4.18.0-80.7.2.el7.aarch64

The rootcause is the missing 'grubby' package in the CentOS docker
image we fetch from upstream, so install it before calling autoremove,
then clean it up later.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: I92e6529e6459b5570d6970a415a249c57aa5ecc3

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index 2bef22e..98a2088 100644 (file)
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -15,7 +15,7 @@
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.16.2
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1
 

diff --git a/docker-build/hyperkube/Dockerfile b/docker-build/hyperkube/Dockerfile
index 95d9675..969c4bf 100644 (file)
--- a/docker-build/hyperkube/Dockerfile
+++ b/docker-build/hyperkube/Dockerfile
@@ -33,6 +33,7 @@ RUN useradd -u 144 -M -s /sbin/nologin kube \
 &&  yum install -y --setopt=skip_missing_names_on_install=False \
       ${ceph_packages} \
       conntrack-tools \
+      grubby \
 \
 # Install kubernetes
 &&  chmod a+x /kube-apiserver \
@@ -42,4 +43,5 @@ RUN useradd -u 144 -M -s /sbin/nologin kube \
 # Clean up
 &&  yum erase -y ceph-release \
 &&  yum autoremove -y \
+&&  yum erase -y grubby \
 &&  yum clean all -y \