Remove CentOS from build targets

cbandy · cbandy · commit 9b374fc04d5b · 2022-03-28T17:11:13.000-05:00
CentOS 8 reached End of Life (EOL) on Dec 31, 2021. Issue: [sc-13732] See: https://www.centos.org/centos-linux-eol/
diff --git a/Makefile b/Makefile
@@ -1,15 +1,13 @@
 
 # Default values if not already set
 PGOROOT ?= $(CURDIR)
-PGO_BASEOS ?= centos8
-BASE_IMAGE_OS ?= $(PGO_BASEOS)
+PGO_BASEOS ?= ubi8
 PGO_IMAGE_PREFIX ?= crunchydata
 PGO_IMAGE_TAG ?= $(PGO_BASEOS)-$(PGO_VERSION)
 PGO_VERSION ?= $(shell git describe --tags)
 PGO_PG_VERSION ?= 13
 PGO_PG_FULLVERSION ?= 13.4
 PGO_KUBE_CLIENT ?= kubectl
-PACKAGER ?= yum
 
 RELTMPDIR=/tmp/release.$(PGO_VERSION)
 RELFILE=/tmp/postgres-operator.$(PGO_VERSION).tar.gz
@@ -30,7 +28,6 @@ ifneq ("$(IMG_ROOTLESS_BUILD)", "true")
 	IMGCMDSUDO=sudo --preserve-env
 endif
 IMGCMDSTEM=$(IMGCMDSUDO) buildah bud --layers $(SQUASH)
-DFSET=$(PGO_BASEOS)
 
 # Default the buildah format to docker to ensure it is possible to pull the images from a docker
 # repository using docker (otherwise the images may not be recognized)
@@ -46,16 +43,9 @@ DOCKERBASEREGISTRY=
 BASE_IMAGE_OS=
 ifeq ("$(PGO_BASEOS)", "ubi8")
     BASE_IMAGE_OS=ubi8-minimal
-    DFSET=rhel
     DOCKERBASEREGISTRY=registry.access.redhat.com/
     PACKAGER=microdnf
 endif
-ifeq ("$(PGO_BASEOS)", "centos8")
-    BASE_IMAGE_OS=centos8
-    DFSET=centos
-    DOCKERBASEREGISTRY=centos:
-    PACKAGER=dnf
-endif
 
 DEBUG_BUILD ?= false
 GO ?= go
@@ -163,7 +153,6 @@ $(PGOROOT)/build/%/Dockerfile:
 		-t $(PGO_IMAGE_PREFIX)/$*:$(PGO_IMAGE_TAG) \
 		--build-arg BASEOS=$(PGO_BASEOS) \
 		--build-arg BASEVER=$(PGO_VERSION) \
-		--build-arg DFSET=$(DFSET) \
 		--build-arg PACKAGER=$(PACKAGER) \
 		--build-arg PGVERSION=$(PGO_PG_VERSION) \
 		--build-arg PREFIX=$(PGO_IMAGE_PREFIX) \
diff --git a/build/crunchy-postgres-exporter/Dockerfile b/build/crunchy-postgres-exporter/Dockerfile
@@ -6,7 +6,6 @@ FROM ${PREFIX}/pgo-base:${BASEOS}-${BASEVER}
 ARG BASEOS
 ARG PGVERSION
 ARG PACKAGER
-ARG DFSET
 
 LABEL name="crunchy-postgres-exporter" \
 	summary="Metrics exporter for PostgreSQL" \
@@ -15,14 +14,6 @@ LABEL name="crunchy-postgres-exporter" \
 	io.k8s.display-name="Crunchy PostgreSQL Exporter" \
 	io.openshift.tags="postgresql,postgres,monitoring,database,crunchy"
 
-RUN if [ "$DFSET" = "centos" ] ; then \
-	${PACKAGER} -y install epel-release \
-    && ${PACKAGER} install -y \
-        --setopt=skip_missing_names_on_install=False \
-        postgresql${PGVERSION} \
-    && ${PACKAGER} -y clean all ; \
-fi
-
 RUN if [ "$BASEOS" = "ubi8" ] ; then \
 	${PACKAGER} install -y \
 		findutils \
diff --git a/build/pgo-base/Dockerfile b/build/pgo-base/Dockerfile
@@ -25,10 +25,6 @@ COPY licenses /licenses
 
 RUN ${PACKAGER} -y update && ${PACKAGER} -y clean all
 
-RUN if [ "$BASEOS" = "centos8" ]; then \
-    ${PACKAGER} -qy module disable postgresql ; \
-fi
-
 # Create module file to disable postgres module, microdnf cannot do this with the current version
 RUN if [ "$BASEOS" = "ubi8" ] ; then \
     echo "[postgresql]"  >> /etc/dnf/modules.d/postgresql.module \
