From 673eff30cc03e590539fca12bc2b1721d68ff4f1 Mon Sep 17 00:00:00 2001 From: Shubhra Deshpande Date: Thu, 19 Sep 2024 17:04:26 -0400 Subject: [PATCH] pgupgrade: updating postgres version to 15 fort clair and quay --- .../quay-operator.clusterserviceversion.yaml | 4 ++-- hack/build.sh | 4 ++-- .../base/clair-pg-old.deployment.yaml | 2 +- .../clairpgupgrade/base/clair-pg-upgrade.job.yaml | 10 +++++----- .../clairpostgres/postgres.deployment.yaml | 4 ++-- .../postgres.persistentvolumeclaim.yaml | 2 +- .../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 +++++++------- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bundle/manifests/quay-operator.clusterserviceversion.yaml b/bundle/manifests/quay-operator.clusterserviceversion.yaml index 6c4700a61..33b2e5425 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-13-c9s:latest + value: quay.io/sclorg/postgresql-15-c9s:latest - name: RELATED_IMAGE_COMPONENT_POSTGRES_PREVIOUS - value: centos/postgresql-10-centos7:latest + value: quay.io/sclorg/postgresql-13-c9s: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 de8d773bc..573c0e8a8 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-13-c9s:latest POSTGRES_DIGEST -digest centos/postgresql-10-centos7:latest POSTGRES_OLD_DIGEST +digest quay.io/sclorg/postgresql-15-c9s:latest POSTGRES_DIGEST +digest quay.io/sclorg/postgresql-13-c9s: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/clairpgupgrade/base/clair-pg-old.deployment.yaml b/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml index 43c411ac1..53718d365 100644 --- a/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml +++ b/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml @@ -29,7 +29,7 @@ spec: claimName: clair-postgres containers: - name: postgres - image: centos/postgresql-10-centos7:latest + image: quay.io/sclorg/postgresql-13-c9s:latest imagePullPolicy: "IfNotPresent" ports: - containerPort: 5432 diff --git a/kustomize/components/clairpgupgrade/base/clair-pg-upgrade.job.yaml b/kustomize/components/clairpgupgrade/base/clair-pg-upgrade.job.yaml index d5e55d9d7..41f1278f2 100644 --- a/kustomize/components/clairpgupgrade/base/clair-pg-upgrade.job.yaml +++ b/kustomize/components/clairpgupgrade/base/clair-pg-upgrade.job.yaml @@ -16,12 +16,12 @@ spec: - name: clair-postgres-conf-sample configMap: name: clair-postgres-conf-sample - - name: clair-postgres-13 + - name: clair-postgres-15 persistentVolumeClaim: - claimName: clair-postgres-13 + claimName: clair-postgres-15 containers: - - name: clair-postgres-13 - image: quay.io/sclorg/postgresql-13-c9s:latest + - name: clair-postgres-15 + image: quay.io/sclorg/postgresql-15-c9s:latest imagePullPolicy: IfNotPresent ports: - containerPort: 5432 @@ -42,7 +42,7 @@ spec: - name: clair-postgres-conf-sample mountPath: /usr/share/pgsql/postgresql.conf.sample subPath: postgresql.conf.sample - - name: clair-postgres-13 + - name: clair-postgres-15 mountPath: /var/lib/pgsql/data resources: requests: diff --git a/kustomize/components/clairpostgres/postgres.deployment.yaml b/kustomize/components/clairpostgres/postgres.deployment.yaml index cb9ade4c8..e31c093c4 100644 --- a/kustomize/components/clairpostgres/postgres.deployment.yaml +++ b/kustomize/components/clairpostgres/postgres.deployment.yaml @@ -26,10 +26,10 @@ spec: name: clair-postgres-conf-sample - name: postgres-data persistentVolumeClaim: - claimName: clair-postgres-13 + claimName: clair-postgres-15 containers: - name: clair-postgres - image: quay.io/sclorg/postgresql-13-c9s:latest + image: quay.io/sclorg/postgresql-15-c9s:latest imagePullPolicy: "IfNotPresent" ports: - containerPort: 5432 diff --git a/kustomize/components/clairpostgres/postgres.persistentvolumeclaim.yaml b/kustomize/components/clairpostgres/postgres.persistentvolumeclaim.yaml index a18630f0b..8e7044b1b 100644 --- a/kustomize/components/clairpostgres/postgres.persistentvolumeclaim.yaml +++ b/kustomize/components/clairpostgres/postgres.persistentvolumeclaim.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: clair-postgres-13 + name: clair-postgres-15 labels: quay-component: clair-postgres annotations: diff --git a/kustomize/components/pgupgrade/quay-pg-old.deployment.yaml b/kustomize/components/pgupgrade/quay-pg-old.deployment.yaml index 0f8c34951..3b378fa98 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: centos/postgresql-10-centos7:latest + image: quay.io/sclorg/postgresql-13-c9s: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 3311b4910..5409ffd83 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-13 + claimName: quay-postgres-15 containers: - name: postgres-upgrade - image: quay.io/sclorg/postgresql-13-c9s:latest + image: quay.io/sclorg/postgresql-15-c9s:latest imagePullPolicy: IfNotPresent ports: - containerPort: 5432 diff --git a/kustomize/components/postgres/postgres.deployment.yaml b/kustomize/components/postgres/postgres.deployment.yaml index 6f18ad244..71830b4ae 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-13 + claimName: quay-postgres-15 containers: - name: postgres - image: quay.io/sclorg/postgresql-13-c9s:latest + image: quay.io/sclorg/postgresql-15-c9s:latest imagePullPolicy: IfNotPresent ports: - containerPort: 5432 diff --git a/kustomize/components/postgres/postgres.persistentvolumeclaim.yaml b/kustomize/components/postgres/postgres.persistentvolumeclaim.yaml index 2d3d415f1..84e9c73f4 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-13 + name: quay-postgres-15 labels: quay-component: postgres annotations: diff --git a/pkg/kustomize/kustomize.go b/pkg/kustomize/kustomize.go index b2d64c5f9..b06fa8a98 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-13-c9s", + v1.ComponentPostgres: "quay.io/sclorg/postgresql-15-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: "centos/postgresql-10-centos7", + Name: "quay.io/sclorg/postgresql-13-c9s", } image := os.Getenv("RELATED_IMAGE_COMPONENT_POSTGRES_PREVIOUS") diff --git a/pkg/kustomize/kustomize_test.go b/pkg/kustomize/kustomize_test.go index 2ec37be44..1b49e1d7b 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-13-c9s", NewName: "postgres", Digest: "sha256:abc123"}, + {Name: "quay.io/sclorg/postgresql-15-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-13-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-15-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-13-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-15-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-13-c9s", NewName: "postgres", NewTag: "latest"}, - {Name: "centos/postgresql-10-centos7", NewName: "postgres_previous", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", 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-13-c9s", NewName: "postgres", NewTag: "latest"}, - {Name: "centos/postgresql-10-centos7", NewName: "postgres_previous", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-15-c9s", NewName: "postgres", NewTag: "latest"}, + {Name: "quay.io/sclorg/postgresql-13-c9s", NewName: "postgres_previous", NewTag: "latest"}, }, SecretGenerator: []types.SecretArgs{}, },