change RHEL dockerfiles to use 3.11 repo instead of 3.9

Author: jmccormick2001

Makefile

@@ -118,15 +118,15 @@ pgo-scheduler-image: check-go-vars
 all:
 	make postgres-operator-image
 	make pgo-apiserver-image
+	make pgo-scheduler-image
+	make pgo
 	make pgo-backrest-repo-image
+	make pgo-backrest-image
+	make pgo-rmdata-image
 	make pgo-backrest-restore-image
-	make pgo
 	make pgo-lspvc-image
 	make pgo-load-image
-	make pgo-rmdata-image
 	make pgo-sqlrunner-image
-	make pgo-backrest-image
-	make pgo-scheduler-image
 push:
 	docker push $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
 	docker push $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)

conf/postgres-operator/pgo.yaml

@@ -4,7 +4,7 @@ Cluster:
   CCPImagePrefix:  crunchydata
   Metrics:  false
   Badger:  false
-  CCPImageTag:  centos7-11.3-2.4.0-rc8
+  CCPImageTag:  rhel7-11.3-2.4.0-rc9
   Port:  5432
   User:  testuser
   Database:  userdb
@@ -24,10 +24,10 @@ Cluster:
   AutofailReplaceReplica:  false
   LogStatement:  none
   LogMinDurationStatement:  60000
-PrimaryStorage: primarysite
-BackupStorage: primarysite
-ReplicaStorage: primarysite
-BackrestStorage: primarysite
+PrimaryStorage: storageos
+BackupStorage: storageos
+ReplicaStorage: storageos
+BackrestStorage: storageos
 Storage:
   hostpathstorage:
     AccessMode:  ReadWriteMany
@@ -101,5 +101,5 @@ Pgo:
   PreferredFailoverNode:  
   Audit:  false
   PGOImagePrefix:  crunchydata
-  PGOImageTag:  centos7-4.0.0-rc11
+  PGOImageTag:  rhel7-4.0.0-rc12
 

rhel7/Dockerfile.pgo-apiserver.rhel7

@@ -24,7 +24,7 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum -y install postgresql${PGVERSION} hostname \
  && yum -y clean all
 

rhel7/Dockerfile.pgo-backrest-repo.rhel7

@@ -20,7 +20,7 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update && \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update && \
 yum -y install psmisc openssh-server openssh-clients crunchy-backrest-"${BACKREST_VERSION}" hostname pgocps-ng && \
 yum -y clean all
 

rhel7/Dockerfile.pgo-backrest-restore.rhel7

@@ -20,7 +20,7 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum -y install psmisc openssh-server openssh-clients crunchy-backrest-"${BACKREST_VERSION}" postgresql11-server procps-ng \
  && yum -y clean all
 

rhel7/Dockerfile.pgo-backrest.rhel7

@@ -23,7 +23,7 @@ COPY redhat/atomic/pgo_backrest/help.1 /help.1
 COPY redhat/atomic/pgo_backrest/help.md /help.md
 COPY redhat/licenses /licenses
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum -y install postgresql11-server \
  && yum -y install crunchy-backrest-"${BACKREST_VERSION}" \
  && yum -y clean all

rhel7/Dockerfile.pgo-load.rhel7

@@ -24,7 +24,7 @@ ADD conf/RPM-GPG-KEY-crunchydata  /
 ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum install -y \
 	gettext \
 	hostname \

rhel7/Dockerfile.pgo-lspvc.rhel7

@@ -19,7 +19,7 @@ ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum -y clean all
 
 #RUN mkdir -p /opt/cpm/bin && chown -R 26:26 /opt/cpm

rhel7/Dockerfile.pgo-rmdata.rhel7

@@ -19,7 +19,7 @@ ADD conf/crunchypg11.repo /etc/yum.repos.d/
 RUN rpm --import RPM-GPG-KEY-crunchydata
 
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum -y clean all
 
 RUN mkdir -p /opt/cpm/bin

rhel7/Dockerfile.pgo-scheduler.rhel7

@@ -16,7 +16,7 @@ COPY redhat/atomic/pgo_scheduler/help.1 /help.1
 COPY redhat/atomic/pgo_scheduler/help.md /help.md
 COPY redhat/licenses /licenses
 
-RUN yum -y --enablerepo=rhel-7-server-ose-3.9-rpms --disablerepo=crunchy* update \
+RUN yum -y --enablerepo=rhel-7-server-ose-3.11-rpms --disablerepo=crunchy* update \
  && yum clean all -y
 
 RUN mkdir -p /opt/cpm/bin /opt/cpm/conf /pgo-config \