Skip to content
This repository was archived by the owner on Jun 26, 2024. It is now read-only.
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ kubectl get pods -n {quickstart-namespace}
+
[source,terminal]
....
NAME READY STATUS RESTARTS AGE
hippo-backup-jxv6--1-smqkz 0/1 Completed 0 42s
hippo-instance1-ml48-0 3/3 Running 0 119s
hippo-pgbouncer-56db454d6b-782hg 2/2 Running 0 118s
hippo-repo-host-0 1/1 Running 0 118s
NAME READY STATUS RESTARTS AGE
hippo-backup-bthn-p6xmn 0/1 Completed 0 16s
hippo-instance1-jqpz-0 4/4 Running 0 99s
hippo-repo-host-0 2/2 Running 0 99s
....
+
The previous output verifies that the database service is created and configured.
17 changes: 3 additions & 14 deletions samples/apps/spring-petclinic/pgcluster-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: PostgresCluster
metadata:
name: hippo
spec:
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres-ha:centos8-13.4-0
postgresVersion: 13
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.4-0
postgresVersion: 14
instances:
- name: instance1
dataVolumeClaimSpec:
Expand All @@ -17,7 +17,7 @@ spec:
storage: 1Gi
backups:
pgbackrest:
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:centos8-2.33-2
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.38-0
repos:
- name: repo1
volume:
Expand All @@ -27,15 +27,4 @@ spec:
resources:
requests:
storage: 1Gi
- name: repo2
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
proxy:
pgBouncer:
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbouncer:centos8-1.15-2
# end::db-deployment[]
2 changes: 2 additions & 0 deletions test/acceptance/features/steps/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ def setenv(self, key, value):

def run(self, cmd, stdin=None):
print(f",---------,-\n| COMMAND : {cmd}\n'---------'-") # for debugging purposes
if stdin is not None:
print(f"With stdin: [\n{stdin}\n]\n")
output = None
exit_code = 0
try:
Expand Down
24 changes: 13 additions & 11 deletions test/acceptance/features/steps/crunchypostgresoperator.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@ class CrunchyPostgresOperator(Operator):

def __init__(self, name="pgo"):
if ctx.cli == "oc":
super().__init__(
name=name,
package_name="crunchy-postgres-operator",
operator_catalog_source_name="certified-operators",
operator_catalog_channel="v5")
package_name = "crunchy-postgres-operator"
catalog_source_name = "certified-operators"
else:
super().__init__(
name=name,
package_name="postgresql",
operator_catalog_source_name="operatorhubio-catalog",
operator_subscription_csv_version="postgresoperator.v5.0.5",
operator_catalog_channel="v5")
package_name = "postgresql"
catalog_source_name = "operatorhubio-catalog"
csv = "postgresoperator.v5.1.2"
channel = "v5"

super().__init__(
name=name,
package_name=package_name,
operator_catalog_source_name=catalog_source_name,
operator_subscription_csv_version=csv,
operator_catalog_channel=channel)


@given(u'Crunchy Data Postgres operator is running')
Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/features/steps/getting_started.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def postgresql_is_running(context):
@step(u'PostgresCluster database is running')
def pgcluster_is_running(context):
yaml_is_applied(context, yaml_file="samples/apps/spring-petclinic/pgcluster-deployment.yaml")
output, exit_code = cmd.run(f"{ctx.cli} wait --for=condition=ProxyAvailable=True PostgresCluster/hippo -n {context.namespace.name} --timeout=300s")
output, exit_code = cmd.run(f"{ctx.cli} wait --for=condition=PGBackRestReplicaCreate=True PostgresCluster/hippo -n {context.namespace.name} --timeout=300s")
assert exit_code == 0, f"Non-zero exit code ({exit_code}) returned when attempting to deploy PostgreSQL database for quickstart:\n {output}"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ Feature: Support a number of existing operator-backed services out of the box
metadata:
name: hippo
spec:
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:centos8-13.4-1
postgresVersion: 13
image: registry.developers.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.4-0
postgresVersion: 14
instances:
- name: instance1
dataVolumeClaimSpec:
Expand All @@ -115,7 +115,7 @@ Feature: Support a number of existing operator-backed services out of the box
storage: 1Gi
backups:
pgbackrest:
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:centos8-2.35-0
image: registry.developers.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.38-0
repos:
- name: repo1
volume:
Expand Down