From d4ec0c0865a3730d73794293ee3d846711e24cdd Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Mon, 23 Sep 2024 10:20:03 -0400 Subject: [PATCH 1/2] pgupgrade: reverting postgres version to 13 for quay This reverts commit 673eff30cc03e590539fca12bc2b1721d68ff4f1. --- .../quay-operator.clusterserviceversion.yaml | 4 ++-- hack/build.sh | 4 ++-- .../pgupgrade/quay-pg-old.deployment.yaml | 2 +- .../components/pgupgrade/quay-pg-upgrade.job.yaml | 4 ++-- .../components/postgres/postgres.deployment.yaml | 4 ++-- .../postgres/postgres.persistentvolumeclaim.yaml | 2 +- pkg/kustomize/kustomize.go | 4 ++-- pkg/kustomize/kustomize_test.go | 14 +++++++------- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bundle/manifests/quay-operator.clusterserviceversion.yaml b/bundle/manifests/quay-operator.clusterserviceversion.yaml index 33b2e5425..6c4700a61 100644 --- a/bundle/manifests/quay-operator.clusterserviceversion.yaml +++ b/bundle/manifests/quay-operator.clusterserviceversion.yaml @@ -158,9 +158,9 @@ spec: - name: RELATED_IMAGE_COMPONENT_BUILDER_QEMU value: quay.io/projectquay/quay-builder-qemu:main - name: RELATED_IMAGE_COMPONENT_POSTGRES - value: quay.io/sclorg/postgresql-15-c9s:latest - - name: RELATED_IMAGE_COMPONENT_POSTGRES_PREVIOUS value: quay.io/sclorg/postgresql-13-c9s:latest + - name: RELATED_IMAGE_COMPONENT_POSTGRES_PREVIOUS + value: centos/postgresql-10-centos7:latest - name: RELATED_IMAGE_COMPONENT_REDIS value: docker.io/library/redis:7.0 serviceAccountName: quay-operator diff --git a/hack/build.sh b/hack/build.sh index 573c0e8a8..de8d773bc 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -67,8 +67,8 @@ digest "${REGISTRY}/${NAMESPACE}/quay:${TAG}" QUAY_DIGEST digest "${REGISTRY}/${NAMESPACE}/clair:nightly" CLAIR_DIGEST digest "${REGISTRY}/${NAMESPACE}/quay-builder:${TAG}" BUILDER_DIGEST digest "${REGISTRY}/${NAMESPACE}/quay-builder-qemu:3.9.0" BUILDER_QEMU_DIGEST -digest quay.io/sclorg/postgresql-15-c9s:latest POSTGRES_DIGEST -digest quay.io/sclorg/postgresql-13-c9s:latest POSTGRES_OLD_DIGEST +digest quay.io/sclorg/postgresql-13-c9s:latest POSTGRES_DIGEST +digest centos/postgresql-10-centos7:latest POSTGRES_OLD_DIGEST digest docker.io/library/redis:7.0 REDIS_DIGEST # need exporting so that yq can see them diff --git a/kustomize/components/pgupgrade/quay-pg-old.deployment.yaml b/kustomize/components/pgupgrade/quay-pg-old.deployment.yaml index 3b378fa98..0f8c34951 100644 --- a/kustomize/components/pgupgrade/quay-pg-old.deployment.yaml +++ b/kustomize/components/pgupgrade/quay-pg-old.deployment.yaml @@ -32,7 +32,7 @@ spec: claimName: quay-database containers: - name: postgres - image: quay.io/sclorg/postgresql-13-c9s:latest + image: centos/postgresql-10-centos7:latest imagePullPolicy: IfNotPresent ports: - containerPort: 5432 diff --git a/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml b/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml index 5409ffd83..3311b4910 100644 --- a/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml +++ b/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml @@ -21,10 +21,10 @@ spec: secretName: postgres-bootstrap - name: postgres-data persistentVolumeClaim: - claimName: quay-postgres-15 + claimName: quay-postgres-13 containers: - name: postgres-upgrade - image: quay.io/sclorg/postgresql-15-c9s:latest + image: quay.io/sclorg/postgresql-13-c9s:latest imagePullPolicy: IfNotPresent ports: - containerPort: 5432 diff --git a/kustomize/components/postgres/postgres.deployment.yaml b/kustomize/components/postgres/postgres.deployment.yaml index 71830b4ae..6f18ad244 100644 --- a/kustomize/components/postgres/postgres.deployment.yaml +++ b/kustomize/components/postgres/postgres.deployment.yaml @@ -29,10 +29,10 @@ spec: secretName: postgres-bootstrap - name: postgres-data persistentVolumeClaim: - claimName: quay-postgres-15 + claimName: quay-postgres-13 containers: - name: postgres - image: quay.io/sclorg/postgresql-15-c9s:latest + image: quay.io/sclorg/postgresql-13-c9s:latest imagePullPolicy: IfNotPresent ports: - containerPort: 5432 diff --git a/kustomize/components/postgres/postgres.persistentvolumeclaim.yaml b/kustomize/components/postgres/postgres.persistentvolumeclaim.yaml index 84e9c73f4..2d3d415f1 100644 --- a/kustomize/components/postgres/postgres.persistentvolumeclaim.yaml +++ b/kustomize/components/postgres/postgres.persistentvolumeclaim.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: quay-postgres-15 + name: quay-postgres-13 labels: quay-component: postgres annotations: diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index b06fa8a98..b2d64c5f9 100644 --- a/pkg/kustomize/kustomize.go +++ b/pkg/kustomize/kustomize.go @@ -61,7 +61,7 @@ func ComponentImageFor(component v1.ComponentKind) (types.Image, error) { v1.ComponentQuay: "quay.io/projectquay/quay", v1.ComponentClair: "quay.io/projectquay/clair", v1.ComponentRedis: "docker.io/library/redis", - v1.ComponentPostgres: "quay.io/sclorg/postgresql-15-c9s", + v1.ComponentPostgres: "quay.io/sclorg/postgresql-13-c9s", } imageOverride := types.Image{ @@ -92,7 +92,7 @@ func ComponentImageFor(component v1.ComponentKind) (types.Image, error) { // to use. If set, returns a Kustomize image override for the given component. func postgresUpgradeImage() (types.Image, error) { imageOverride := types.Image{ - Name: "quay.io/sclorg/postgresql-13-c9s", + Name: "centos/postgresql-10-centos7", } image := os.Getenv("RELATED_IMAGE_COMPONENT_POSTGRES_PREVIOUS") diff --git a/pkg/kustomize/kustomize_test.go b/pkg/kustomize/kustomize_test.go index 1b49e1d7b..2ec37be44 100644 --- a/pkg/kustomize/kustomize_test.go +++ b/pkg/kustomize/kustomize_test.go @@ -95,7 +95,7 @@ var kustomizationForTests = []struct { {Name: "quay.io/projectquay/quay", NewName: "quay", Digest: "sha256:abc123"}, {Name: "quay.io/projectquay/clair", NewName: "clair", Digest: "sha256:abc123"}, {Name: "docker.io/library/redis", NewName: "redis", Digest: "sha256:abc123"}, - {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", Digest: "sha256:abc123"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres", Digest: "sha256:abc123"}, }, SecretGenerator: []types.SecretArgs{}, }, @@ -128,7 +128,7 @@ var kustomizationForTests = []struct { {Name: "quay.io/projectquay/quay", NewName: "quay", NewTag: "latest"}, {Name: "quay.io/projectquay/clair", NewName: "clair", NewTag: "alpine"}, {Name: "docker.io/library/redis", NewName: "redis", NewTag: "buster"}, - {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres", NewTag: "latest"}, }, SecretGenerator: []types.SecretArgs{}, }, @@ -160,7 +160,7 @@ var kustomizationForTests = []struct { {Name: "quay.io/projectquay/quay", NewName: "quay", NewTag: "latest"}, {Name: "quay.io/projectquay/clair", NewName: "clair", NewTag: "alpine"}, {Name: "docker.io/library/redis", NewName: "redis", NewTag: "buster"}, - {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres", NewTag: "latest"}, }, SecretGenerator: []types.SecretArgs{}, }, @@ -195,8 +195,8 @@ var kustomizationForTests = []struct { {Name: "quay.io/projectquay/quay", NewName: "quay", NewTag: "latest"}, {Name: "quay.io/projectquay/clair", NewName: "clair", NewTag: "alpine"}, {Name: "docker.io/library/redis", NewName: "redis", NewTag: "buster"}, - {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", NewTag: "latest"}, - {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres_previous", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "centos/postgresql-10-centos7", NewName: "postgres_previous", NewTag: "latest"}, }, SecretGenerator: []types.SecretArgs{}, }, @@ -230,8 +230,8 @@ var kustomizationForTests = []struct { {Name: "quay.io/projectquay/quay", NewName: "quay", NewTag: "latest"}, {Name: "quay.io/projectquay/clair", NewName: "clair", NewTag: "alpine"}, {Name: "docker.io/library/redis", NewName: "redis", NewTag: "buster"}, - {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", NewTag: "latest"}, - {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres_previous", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "centos/postgresql-10-centos7", NewName: "postgres_previous", NewTag: "latest"}, }, SecretGenerator: []types.SecretArgs{}, }, From cab05d3a582f30438177f7a14d4654ec5114dbb7 Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Tue, 24 Sep 2024 14:02:08 -0400 Subject: [PATCH 2/2] Minor: Added new line at the end of the file --- kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml b/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml index 3311b4910..1b5e6dd9e 100644 --- a/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml +++ b/kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml @@ -61,3 +61,4 @@ spec: - > run-postgresql --version || (echo "postgres migration command failed, cleaning up..." && rm -rf /var/lib/pgsql/data/* && exit 1) backoffLimit: 50 +