Skip to content

Commit ee09d3a

Browse files
cahoonpworkcahoonpwork
authored
merge Develop 3.5 for 3.5.3 release (#765)
* fix pgo status not ready reporting, update dockerfiles to latest pgdg and backrest versions * Delete the pgdump pod once the backup has completed. (#752) * Delete the pgdump pod once the backup has completed. * Change pgdump cleanup to remove job instead of just pod once completed * fix primary delete in failover logic to wait for full deletion of pod * add crunchy yum repo to dockerfiles for scanning * Hlord update backport (#756) * Backporting yum update changes to 3.5.2 * Adding back the inclusion of crunchy pg11 repo * update pg version and operator version (#761) * Update pgBackRest version to 2.13 in rhel images (#764)
1 parent 7e867eb commit ee09d3a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+194
-138
lines changed

‎apiserver/statusservice/statusimpl.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ limitations under the License.
1616
*/
1717

1818
import (
19-
log "github.com/sirupsen/logrus"
2019
"github.com/crunchydata/postgres-operator/apiserver"
2120
msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
2221
"github.com/crunchydata/postgres-operator/kubeapi"
2322
"github.com/crunchydata/postgres-operator/util"
23+
log "github.com/sirupsen/logrus"
2424
"k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/resource"
2626
"k8s.io/client-go/kubernetes"
@@ -149,9 +149,13 @@ func getNotReady(ns string) []string {
149149
return agg
150150
}
151151
for _, p := range pods.Items {
152-
for _, stat := range p.Status.ContainerStatuses {
153-
if !stat.Ready {
154-
agg = append(agg, p.ObjectMeta.Name)
152+
if p.ObjectMeta.Labels["job-name"] != "" {
153+
log.Debugf("status - skipping job pod in getNotReady %s", p.ObjectMeta.Name)
154+
} else {
155+
for _, stat := range p.Status.ContainerStatuses {
156+
if !stat.Ready {
157+
agg = append(agg, p.ObjectMeta.Name)
158+
}
155159
}
156160
}
157161
}

‎apiservermsgs/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717

1818
import ()
1919

20-
const PGO_VERSION = "3.5.2"
20+
const PGO_VERSION = "3.5.3"
2121

2222
// Ok status
2323
const Ok = "ok"

‎bin/push-ccp-to-gcr.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
GCR_IMAGE_PREFIX=gcr.io/crunchy-dev-test
1717

1818
CCP_IMAGE_PREFIX=crunchydata
19-
CCP_IMAGE_TAG=centos7-11.2-2.3.1
19+
CCP_IMAGE_TAG=centos7-11.3-2.3.2
2020

2121
IMAGES=(
2222
crunchy-prometheus

‎centos7/Dockerfile.pgo-apiserver.centos7‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ FROM centos:7
22

33
LABEL Vendor="Crunchy Data Solutions" \
44
PostgresVersion="11" \
5-
PostgresFullVersion="11.2" \
5+
PostgresFullVersion="11.3" \
66
Version="7.6" \
7-
Release="3.5.2" \
7+
Release="3.5.3" \
88
summary="Crunchy Data PostgreSQL Operator - Apiserver" \
99
description="Crunchy Data PostgreSQL Operator - Apiserver"
1010

11-
ENV PGVERSION="11" PGDG_REPO="pgdg-centos11-11-2.noarch.rpm"
11+
ENV PGVERSION="11" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm"
1212

1313
# PGDG PostgreSQL Repository
1414

‎centos7/Dockerfile.pgo-backrest-repo.centos7‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@ FROM centos:7
22

33
LABEL Vendor="Crunchy Data Solutions" \
44
PostgresVersion="11" \
5-
PostgresFullVersion="11.2" \
5+
PostgresFullVersion="11.3" \
66
Version="7.6" \
7-
Release="3.5.2" \
7+
Release="3.5.3" \
88
summary="Crunchy Data PostgreSQL Operator - Apiserver" \
99
description="Crunchy Data PostgreSQL Operator - Apiserver"
1010

11-
ENV PGVERSION="11" PGDG_REPO="pgdg-centos11-11-2.noarch.rpm" BACKREST_VERSION="2.10"
11+
ENV PGVERSION="11" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg10,pgdg96,pgdg95,pgdg94" \
12+
BACKREST_VERSION="2.13"
1213

1314
# PGDG PostgreSQL Repository
1415

1516
RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
1617

1718
RUN yum -y update && \
1819
#yum -y install epel-release && \
19-
yum -y install psmisc openssh-server openssh-clients pgbackrest-"${BACKREST_VERSION}" hostname pgocps-ng && \
20+
yum -y install --disablerepo="${PGDG_REPO_DISABLE}" \
21+
psmisc openssh-server openssh-clients pgbackrest-"${BACKREST_VERSION}" hostname pgocps-ng && \
2022
yum -y clean all
2123

2224
RUN groupadd pgbackrest -g 2000 && useradd pgbackrest -u 2000 -g 2000
@@ -25,6 +27,8 @@ RUN chmod +x /usr/local/bin/pgo-backrest-repo.sh && mkdir -p /opt/cpm/bin && cho
2527

2628
ADD bin/uid_pgbackrest.sh /opt/cpm/bin
2729

30+
ADD conf/pgo-backrest-repo/.bashrc /home/pgbackrest
31+
2832
RUN chmod g=u /etc/passwd && \
2933
chmod g=u /etc/group
3034

‎centos7/Dockerfile.pgo-backrest-restore.centos7‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ FROM centos:7
22

33
LABEL Vendor="Crunchy Data Solutions" \
44
PostgresVersion="11" \
5-
PostgresFullVersion="11.2" \
5+
PostgresFullVersion="11.3" \
66
Version="7.6" \
7-
Release="3.5.2" \
7+
Release="3.5.3" \
88
summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
99
description="pgBackRest image that is integrated for use with Crunchy Data's PostgreSQL Operator."
1010

11-
ENV PGVERSION="11" PGDG_REPO="pgdg-centos11-11-2.noarch.rpm" BACKREST_VERSION="2.10"
11+
ENV PGVERSION="11" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg10,pgdg96,pgdg95,pgdg94" \
12+
BACKREST_VERSION="2.13"
1213

1314
RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
1415

15-
RUN yum -y update && yum -y install psmisc openssh-server openssh-clients pgbackrest-"${BACKREST_VERSION}" postgresql11-server procps-ng && yum -y clean all
16+
RUN yum -y update && yum -y install --disablerepo="${PGDG_REPO_DISABLE}" \
17+
psmisc openssh-server openssh-clients pgbackrest-"${BACKREST_VERSION}" postgresql11-server procps-ng && yum -y clean all
18+
1619

1720
VOLUME ["/sshd", "/pgdata"]
1821

‎centos7/Dockerfile.pgo-backrest.centos7‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@ FROM centos:7
22

33
LABEL Vendor="Crunchy Data Solutions" \
44
PostgresVersion="11" \
5-
PostgresFullVersion="11.2" \
5+
PostgresFullVersion="11.3" \
66
Version="7.6" \
7-
Release="3.5.2" \
7+
Release="3.5.3" \
88
summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
99
description="pgBackRest image that is integrated for use with Crunchy Data's PostgreSQL Operator."
1010

11-
ENV PGVERSION="11" PGDG_REPO="pgdg-centos11-11-2.noarch.rpm" BACKREST_VERSION="2.10"
11+
ENV PGVERSION="11" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm" PGDG_REPO_DISABLE="pgdg10,pgdg96,pgdg95,pgdg94" \
12+
BACKREST_VERSION="2.13"
1213

1314
RUN rpm -Uvh https://download.postgresql.org/pub/repos/yum/${PGVERSION}/redhat/rhel-7-x86_64/${PGDG_REPO}
1415

15-
RUN yum -y update && yum -y install postgresql11-server && yum -y install pgbackrest-"${BACKREST_VERSION}" && yum -y clean all
16+
RUN yum -y update && yum -y install --disablerepo="${PGDG_REPO_DISABLE}" \
17+
postgresql11-server && yum -y install pgbackrest-"${BACKREST_VERSION}" && yum -y clean all
18+
1619

1720
RUN mkdir -p /opt/cpm/bin /pgdata /backrestrepo && chown -R 26:26 /opt/cpm
1821
ADD bin/pgo-backrest/ /opt/cpm/bin

‎centos7/Dockerfile.pgo-load.centos7‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ FROM centos:7
33
LABEL name="crunchydata/pgo-load" \
44
vendor="crunchy data" \
55
PostgresVersion="11" \
6-
PostgresFullVersion="11.2" \
6+
PostgresFullVersion="11.3" \
77
Version="7.6" \
8-
Release="3.5.2" \
8+
Release="3.5.3" \
99
url="https://crunchydata.com" \
1010
summary="Crunchy Data PostgreSQL Operator - Load Data" \
1111
description="Loads a CSV or JSON file into the database." \
@@ -14,7 +14,7 @@ LABEL name="crunchydata/pgo-load" \
1414
io.openshift.expose-services="" \
1515
io.openshift.tags="crunchy,database"
1616

17-
ENV PGVERSION="11" PGDG_REPO="pgdg-centos11-11-2.noarch.rpm"
17+
ENV PGVERSION="11" PGDG_REPO="pgdg-redhat-repo-latest.noarch.rpm"
1818

1919
# PGDG PostgreSQL Repository
2020

‎centos7/Dockerfile.pgo-lspvc.centos7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM centos:7
22

33
LABEL Vendor="Crunchy Data Solutions" \
44
Version="7.6" \
5-
Release="3.5.2" \
5+
Release="3.5.3" \
66
summary="Crunchy Data PostgreSQL Operator - Display PVC" \
77
description="Crunchy Data PostgreSQL Operator - Display contents of a PVC"
88

‎centos7/Dockerfile.pgo-rmdata.centos7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM centos:7
22

33
LABEL Vendor="Crunchy Data Solutions" \
44
Version="7.6" \
5-
Release="3.5.2" \
5+
Release="3.5.3" \
66
summary="Crunchy Data PostgreSQL Operator - Remove Data" \
77
description="Crunchy Data PostgreSQL Operator - Remove Data"
88

0 commit comments

Comments
 (0)