Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pgupgrade: reverting postgresql version to 13 for quay (PROJQUAY-7253) #961

Merged
merged 2 commits into from
Sep 25, 2024
Merged

pgupgrade: reverting postgresql version to 13 for quay (PROJQUAY-7253) #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ec0c0
pgupgrade: reverting postgres version to 13 for quay
Sep 23, 2024
cab05d3
Minor: Added new line at the end of the file
Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundle/manifests/quay-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kustomize/components/pgupgrade/quay-pg-old.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions kustomize/components/pgupgrade/quay-pg-upgrade.job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

4 changes: 2 additions & 2 deletions kustomize/components/postgres/postgres.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kustomize/components/postgres/postgres.persistentvolumeclaim.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: quay-postgres-15
name: quay-postgres-13
labels:
quay-component: postgres
annotations:
Expand Down
4 changes: 2 additions & 2 deletions pkg/kustomize/kustomize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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")
Expand Down
14 changes: 7 additions & 7 deletions pkg/kustomize/kustomize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{},
},
Expand Down Expand Up @@ -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{},
},
Expand Down Expand Up @@ -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{},
},
Expand Down Expand Up @@ -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{},
},
Expand Down Expand Up @@ -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{},
},
Expand Down
Loading