Skip to content

Commit 451970d

Browse files
authored
NO-ISSUE: rename docker image for postgres 12 as latest tag disappeared (#6116)
Signed-off-by: Riccardo Piccoli <[email protected]>
1 parent fe16303 commit 451970d

14 files changed

+15
-15
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ DEBUG_SERVICE_PORT := $(or ${DEBUG_SERVICE_PORT},40000)
3939
SERVICE := $(or ${SERVICE},${ASSISTED_ORG}/assisted-service:${ASSISTED_TAG})
4040
IMAGE_SERVICE := $(or ${IMAGE_SERVICE},${ASSISTED_ORG}/assisted-image-service:${ASSISTED_TAG})
4141
ASSISTED_UI := $(or ${ASSISTED_UI},${ASSISTED_ORG}/assisted-installer-ui:${ASSISTED_TAG})
42-
PSQL_IMAGE := $(or ${PSQL_IMAGE},quay.io/centos7/postgresql-12-centos7:latest)
42+
PSQL_IMAGE := $(or ${PSQL_IMAGE},quay.io/sclorg/postgresql-12-c8s:latest)
4343
BUNDLE_IMAGE := $(or ${BUNDLE_IMAGE},${ASSISTED_ORG}/assisted-service-operator-bundle:${ASSISTED_TAG})
4444
INDEX_IMAGE := $(or ${INDEX_IMAGE},${ASSISTED_ORG}/assisted-service-index:${ASSISTED_TAG})
4545

config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
- name: IMAGE_SERVICE_IMAGE
3636
value: quay.io/edge-infrastructure/assisted-image-service:latest
3737
- name: DATABASE_IMAGE
38-
value: quay.io/centos7/postgresql-12-centos7:latest
38+
value: quay.io/sclorg/postgresql-12-c8s:latest
3939
- name: AGENT_IMAGE
4040
value: quay.io/edge-infrastructure/assisted-installer-agent:latest
4141
- name: CONTROLLER_IMAGE

config/manifests/bases/assisted-service-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ spec:
158158
name: controller
159159
- image: quay.io/edge-infrastructure/assisted-image-service:latest
160160
name: image-service
161-
- image: quay.io/centos7/postgresql-12-centos7:latest
161+
- image: quay.io/sclorg/postgresql-12-c8s:latest
162162
name: postgresql
163163
- image: quay.io/edge-infrastructure/assisted-installer:latest
164164
name: installer

deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ spec:
981981
- name: IMAGE_SERVICE_IMAGE
982982
value: quay.io/edge-infrastructure/assisted-image-service:latest
983983
- name: DATABASE_IMAGE
984-
value: quay.io/centos7/postgresql-12-centos7:latest
984+
value: quay.io/sclorg/postgresql-12-c8s:latest
985985
- name: AGENT_IMAGE
986986
value: quay.io/edge-infrastructure/assisted-installer-agent:latest
987987
- name: CONTROLLER_IMAGE
@@ -1119,7 +1119,7 @@ spec:
11191119
name: controller
11201120
- image: quay.io/edge-infrastructure/assisted-image-service:latest
11211121
name: image-service
1122-
- image: quay.io/centos7/postgresql-12-centos7:latest
1122+
- image: quay.io/sclorg/postgresql-12-c8s:latest
11231123
name: postgresql
11241124
- image: quay.io/edge-infrastructure/assisted-installer:latest
11251125
name: installer

deploy/podman/pod-persistent-disconnected.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
containers:
99
- args:
1010
- run-postgresql
11-
image: quay.io/centos7/postgresql-12-centos7:latest
11+
image: quay.io/sclorg/postgresql-12-c8s:latest
1212
name: db
1313
envFrom:
1414
- configMapRef:

deploy/podman/pod-persistent.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
containers:
99
- args:
1010
- run-postgresql
11-
image: quay.io/centos7/postgresql-12-centos7:latest
11+
image: quay.io/sclorg/postgresql-12-c8s:latest
1212
name: db
1313
envFrom:
1414
- configMapRef:

deploy/podman/pod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
containers:
99
- args:
1010
- run-postgresql
11-
image: quay.io/centos7/postgresql-12-centos7:latest
11+
image: quay.io/sclorg/postgresql-12-c8s:latest
1212
name: db
1313
envFrom:
1414
- configMapRef:

deploy/podman/pod_tls.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
containers:
99
- args:
1010
- run-postgresql
11-
image: quay.io/centos7/postgresql-12-centos7:latest
11+
image: quay.io/sclorg/postgresql-12-c8s:latest
1212
name: db
1313
envFrom:
1414
- configMapRef:

deploy/postgres/postgres-deployment-ephemeral.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: postgres
18-
image: quay.io/centos7/postgresql-12-centos7
18+
image: quay.io/sclorg/postgresql-12-c8s
1919
imagePullPolicy: "IfNotPresent"
2020
ports:
2121
- containerPort: 5432

deploy/postgres/postgres-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: postgres
18-
image: quay.io/centos7/postgresql-12-centos7
18+
image: quay.io/sclorg/postgresql-12-c8s
1919
imagePullPolicy: "IfNotPresent"
2020
ports:
2121
- containerPort: 5432

docs/dev/testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The assisted-installer tests are divided into 3 categories:
44

55
* **Unit tests** - Focused on a module/function level while other modules are mocked.
66
Unit tests are located in the package, where the code they are testing resides, using the pattern `<module_name>_test.go`.
7-
Unit tests needs a postgresql db container. The image for db container `quay.io/centos7/postgresql-12-centos7:latest` is built from `https://github.com/sclorg/postgresql-container`
7+
Unit tests needs a postgresql db container. The image for db container `quay.io/sclorg/postgresql-12-c8s:latest` is built from `https://github.com/sclorg/postgresql-container`
88

99
* **Subsystem tests** - Focused on the component while mocking other component.
1010
For example, assisted-service subsystem tests mock the agent responses.

internal/common/common_unitest_db.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func (c *K8SDBContext) Create() error {
131131
Containers: []corev1.Container{
132132
{
133133
Name: "psql",
134-
Image: "quay.io/centos7/postgresql-12-centos7",
134+
Image: "quay.io/sclorg/postgresql-12-c8s",
135135
Ports: []corev1.ContainerPort{
136136
{
137137
Name: "tcp-5432",

internal/common/testcontainers_db_context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func (c *TestContainersDBContext) Create() error {
2020
var err error
2121
c.dbContainer, err = testcontainers.GenericContainer(c.ctx, testcontainers.GenericContainerRequest{
2222
ContainerRequest: testcontainers.ContainerRequest{
23-
Image: "quay.io/centos7/postgresql-12-centos7:latest",
23+
Image: "quay.io/sclorg/postgresql-12-c8s:latest",
2424
Env: map[string]string{"POSTGRESQL_ADMIN_PASSWORD": "admin"},
2525
ExposedPorts: []string{fmt.Sprintf("%s/tcp", dbDefaultPort)},
2626
Name: dbDockerName,

internal/controller/controllers/images.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func ImageServiceImage() string {
3333
}
3434

3535
func DatabaseImage() string {
36-
return getEnvVar("DATABASE_IMAGE", "quay.io/centos7/postgresql-12-centos7:latest")
36+
return getEnvVar("DATABASE_IMAGE", "quay.io/sclorg/postgresql-12-c8s:latest")
3737
}
3838

3939
func AgentImage() string {

0 commit comments

Comments
 (0)