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.

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

NO-ISSUE: replace postgres images as current one disappeared from quay #6134

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ DEBUG_SERVICE_PORT := $(or ${DEBUG_SERVICE_PORT},40000)
SERVICE := $(or ${SERVICE},${ASSISTED_ORG}/assisted-service:${ASSISTED_TAG})
IMAGE_SERVICE := $(or ${IMAGE_SERVICE},${ASSISTED_ORG}/assisted-image-service:${ASSISTED_TAG})
ASSISTED_UI := $(or ${ASSISTED_UI},${ASSISTED_ORG}/assisted-installer-ui:${ASSISTED_TAG})
PSQL_IMAGE := $(or ${PSQL_IMAGE},quay.io/centos7/postgresql-12-centos7:latest)
PSQL_IMAGE := $(or ${PSQL_IMAGE},quay.io/sclorg/postgresql-12-c8s:latest)
BUNDLE_IMAGE := $(or ${BUNDLE_IMAGE},${ASSISTED_ORG}/assisted-service-operator-bundle:${ASSISTED_TAG})
INDEX_IMAGE := $(or ${INDEX_IMAGE},${ASSISTED_ORG}/assisted-service-index:${ASSISTED_TAG})

Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- name: IMAGE_SERVICE_IMAGE
value: quay.io/edge-infrastructure/assisted-image-service:latest
- name: DATABASE_IMAGE
value: quay.io/centos7/postgresql-12-centos7:latest
value: quay.io/sclorg/postgresql-12-c8s:latest
- name: AGENT_IMAGE
value: quay.io/edge-infrastructure/assisted-installer-agent:latest
- name: CONTROLLER_IMAGE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ spec:
name: controller
- image: quay.io/edge-infrastructure/assisted-image-service:latest
name: image-service
- image: quay.io/centos7/postgresql-12-centos7:latest
- image: quay.io/sclorg/postgresql-12-c8s:latest
name: postgresql
- image: quay.io/edge-infrastructure/assisted-installer:latest
name: installer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ spec:
- name: IMAGE_SERVICE_IMAGE
value: quay.io/edge-infrastructure/assisted-image-service:latest
- name: DATABASE_IMAGE
value: quay.io/centos7/postgresql-12-centos7:latest
value: quay.io/sclorg/postgresql-12-c8s:latest
- name: AGENT_IMAGE
value: quay.io/edge-infrastructure/assisted-installer-agent:latest
- name: CONTROLLER_IMAGE
Expand Down Expand Up @@ -1049,7 +1049,7 @@ spec:
name: controller
- image: quay.io/edge-infrastructure/assisted-image-service:latest
name: image-service
- image: quay.io/centos7/postgresql-12-centos7:latest
- image: quay.io/sclorg/postgresql-12-c8s:latest
name: postgresql
- image: quay.io/edge-infrastructure/assisted-installer:latest
name: installer
Expand Down
2 changes: 1 addition & 1 deletion deploy/podman/pod-persistent-disconnected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
containers:
- args:
- run-postgresql
image: quay.io/centos7/postgresql-12-centos7:latest
image: quay.io/sclorg/postgresql-12-c8s:latest
name: db
envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion deploy/podman/pod-persistent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
containers:
- args:
- run-postgresql
image: quay.io/centos7/postgresql-12-centos7:latest
image: quay.io/sclorg/postgresql-12-c8s:latest
name: db
envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion deploy/podman/pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
containers:
- args:
- run-postgresql
image: quay.io/centos7/postgresql-12-centos7:latest
image: quay.io/sclorg/postgresql-12-c8s:latest
name: db
envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion deploy/podman/pod_tls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
containers:
- args:
- run-postgresql
image: quay.io/centos7/postgresql-12-centos7:latest
image: quay.io/sclorg/postgresql-12-c8s:latest
name: db
envFrom:
- configMapRef:
Expand Down
2 changes: 1 addition & 1 deletion deploy/postgres/postgres-deployment-ephemeral.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: postgres
image: quay.io/centos7/postgresql-12-centos7
image: quay.io/sclorg/postgresql-12-c8s
imagePullPolicy: "IfNotPresent"
ports:
- containerPort: 5432
Expand Down
2 changes: 1 addition & 1 deletion deploy/postgres/postgres-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: postgres
image: quay.io/centos7/postgresql-12-centos7
image: quay.io/sclorg/postgresql-12-c8s
imagePullPolicy: "IfNotPresent"
ports:
- containerPort: 5432
Expand Down
2 changes: 1 addition & 1 deletion docs/dev/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The assisted-installer tests are divided into 3 categories:

* **Unit tests** - Focused on a module/function level while other modules are mocked.
Unit tests are located in the package, where the code they are testing resides, using the pattern `<module_name>_test.go`.
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`
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`

* **Subsystem tests** - Focused on the component while mocking other component.
For example, assisted-service subsystem tests mock the agent responses.
Expand Down
4 changes: 2 additions & 2 deletions internal/common/common_unitest_db.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (c *DockerDBContext) Create() error {
oldResource.Close()
}
resource, err := c.pool.RunWithOptions(&dockertest.RunOptions{
Repository: "quay.io/centos7/postgresql-12-centos7",
Repository: "quay.io/sclorg/postgresql-12-c8s",
Tag: "latest",
Env: []string{"POSTGRESQL_ADMIN_PASSWORD=admin"},
Name: dbDockerName,
Expand Down Expand Up @@ -177,7 +177,7 @@ func (c *K8SDBContext) Create() error {
Containers: []corev1.Container{
{
Name: "psql",
Image: "quay.io/centos7/postgresql-12-centos7",
Image: "quay.io/sclorg/postgresql-12-c8s",
Ports: []corev1.ContainerPort{
{
Name: "tcp-5432",
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/controllers/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func ImageServiceImage() string {
}

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

func AgentImage() string {
Expand Down