fix healthcheck for pg

truenas · Oct 24, 2024 · 7ea0e2a · 7ea0e2a
1 parent 720142c
commit 7ea0e2a
Show file tree

Hide file tree

Showing 50 changed files with 6 additions and 5 deletions.
diff --git a/library/2.0.0/tests/__init__.py b/library/2.0.0/tests/__init__.py
diff --git a/...brary/enterprise/minio/v1_1_7/__init__.py → library/2.0.1/__init__.py b/...brary/enterprise/minio/v1_1_7/__init__.py → library/2.0.1/__init__.py
diff --git a/library/2.0.0/configs.py → library/2.0.1/configs.py b/library/2.0.0/configs.py → library/2.0.1/configs.py
diff --git a/library/2.0.0/container.py → library/2.0.1/container.py b/library/2.0.0/container.py → library/2.0.1/container.py
diff --git a/library/2.0.0/depends.py → library/2.0.1/depends.py b/library/2.0.0/depends.py → library/2.0.1/depends.py
diff --git a/library/2.0.0/deploy.py → library/2.0.1/deploy.py b/library/2.0.0/deploy.py → library/2.0.1/deploy.py
diff --git a/library/2.0.0/deps.py → library/2.0.1/deps.py b/library/2.0.0/deps.py → library/2.0.1/deps.py
@@ -242,7 +242,8 @@ def perform_action(action):
                 print("Permissions are correct. Skipping...")
 
     print(f"Time taken: {(time.time() - start_time) * 1000:.2f}ms")
-    print(f"=== Finished applying configuration on volume with identifier [{action['identifier']}] ===")
+    print(f"=== Finished applying configuration on volume with identifier [{action['identifier']}] ==")
+    print()
 
 if __name__ == "__main__":
     start_time = time.time()

diff --git a/library/2.0.0/device.py → library/2.0.1/device.py b/library/2.0.0/device.py → library/2.0.1/device.py
diff --git a/library/2.0.0/devices.py → library/2.0.1/devices.py b/library/2.0.0/devices.py → library/2.0.1/devices.py
diff --git a/library/2.0.0/dns.py → library/2.0.1/dns.py b/library/2.0.0/dns.py → library/2.0.1/dns.py
diff --git a/library/2.0.0/environment.py → library/2.0.1/environment.py b/library/2.0.0/environment.py → library/2.0.1/environment.py
diff --git a/library/2.0.0/error.py → library/2.0.1/error.py b/library/2.0.0/error.py → library/2.0.1/error.py
diff --git a/library/2.0.0/formatter.py → library/2.0.1/formatter.py b/library/2.0.0/formatter.py → library/2.0.1/formatter.py
diff --git a/library/2.0.0/functions.py → library/2.0.1/functions.py b/library/2.0.0/functions.py → library/2.0.1/functions.py
diff --git a/library/2.0.0/healthcheck.py → library/2.0.1/healthcheck.py b/library/2.0.0/healthcheck.py → library/2.0.1/healthcheck.py
@@ -182,7 +182,7 @@ def postgres_test(config: dict) -> str:
     port = get_key(config, "port", 5432, False)
     host = get_key(config, "host", "127.0.0.1", False)
 
-    return f"pg_isready -h {host} -p {port} -U $POSTGRES_USERNAME -d $POSTGRES_DATABASE"
+    return f"pg_isready -h {host} -p {port} -U $POSTGRES_USER -d $POSTGRES_DB"
 
 
 def mariadb_test(config: dict) -> str:

diff --git a/library/2.0.0/labels.py → library/2.0.1/labels.py b/library/2.0.0/labels.py → library/2.0.1/labels.py
diff --git a/library/2.0.0/notes.py → library/2.0.1/notes.py b/library/2.0.0/notes.py → library/2.0.1/notes.py
diff --git a/library/2.0.0/portal.py → library/2.0.1/portal.py b/library/2.0.0/portal.py → library/2.0.1/portal.py
diff --git a/library/2.0.0/portals.py → library/2.0.1/portals.py b/library/2.0.0/portals.py → library/2.0.1/portals.py
diff --git a/library/2.0.0/ports.py → library/2.0.1/ports.py b/library/2.0.0/ports.py → library/2.0.1/ports.py
diff --git a/library/2.0.0/render.py → library/2.0.1/render.py b/library/2.0.0/render.py → library/2.0.1/render.py
diff --git a/library/2.0.0/resources.py → library/2.0.1/resources.py b/library/2.0.0/resources.py → library/2.0.1/resources.py
diff --git a/library/2.0.0/restart.py → library/2.0.1/restart.py b/library/2.0.0/restart.py → library/2.0.1/restart.py
diff --git a/library/2.0.0/storage.py → library/2.0.1/storage.py b/library/2.0.0/storage.py → library/2.0.1/storage.py
diff --git a/library/2.0.0/__init__.py → library/2.0.1/tests/__init__.py b/library/2.0.0/__init__.py → library/2.0.1/tests/__init__.py
diff --git a/library/2.0.0/tests/test_build_image.py → library/2.0.1/tests/test_build_image.py b/library/2.0.0/tests/test_build_image.py → library/2.0.1/tests/test_build_image.py
diff --git a/library/2.0.0/tests/test_configs.py → library/2.0.1/tests/test_configs.py b/library/2.0.0/tests/test_configs.py → library/2.0.1/tests/test_configs.py
diff --git a/library/2.0.0/tests/test_container.py → library/2.0.1/tests/test_container.py b/library/2.0.0/tests/test_container.py → library/2.0.1/tests/test_container.py
diff --git a/library/2.0.0/tests/test_depends.py → library/2.0.1/tests/test_depends.py b/library/2.0.0/tests/test_depends.py → library/2.0.1/tests/test_depends.py
diff --git a/library/2.0.0/tests/test_deps.py → library/2.0.1/tests/test_deps.py b/library/2.0.0/tests/test_deps.py → library/2.0.1/tests/test_deps.py
@@ -56,7 +56,7 @@ def test_add_postgres(mock_values):
     assert output["services"]["pg_container"]["deploy"]["resources"]["limits"]["cpus"] == "2.0"
     assert output["services"]["pg_container"]["deploy"]["resources"]["limits"]["memory"] == "4096M"
     assert output["services"]["pg_container"]["healthcheck"] == {
-        "test": "pg_isready -h 127.0.0.1 -p 5432 -U $$POSTGRES_USERNAME -d $$POSTGRES_DATABASE",
+        "test": "pg_isready -h 127.0.0.1 -p 5432 -U $$POSTGRES_USER -d $$POSTGRES_DB",
         "interval": "10s",
         "timeout": "5s",
         "retries": 30,

diff --git a/library/2.0.0/tests/test_device.py → library/2.0.1/tests/test_device.py b/library/2.0.0/tests/test_device.py → library/2.0.1/tests/test_device.py
diff --git a/library/2.0.0/tests/test_dns.py → library/2.0.1/tests/test_dns.py b/library/2.0.0/tests/test_dns.py → library/2.0.1/tests/test_dns.py
diff --git a/library/2.0.0/tests/test_environment.py → library/2.0.1/tests/test_environment.py b/library/2.0.0/tests/test_environment.py → library/2.0.1/tests/test_environment.py
diff --git a/library/2.0.0/tests/test_functions.py → library/2.0.1/tests/test_functions.py b/library/2.0.0/tests/test_functions.py → library/2.0.1/tests/test_functions.py
diff --git a/library/2.0.0/tests/test_healthcheck.py → library/2.0.1/tests/test_healthcheck.py b/library/2.0.0/tests/test_healthcheck.py → library/2.0.1/tests/test_healthcheck.py
@@ -172,7 +172,7 @@ def test_postgres_healthcheck(mock_values):
     output = render.render()
     assert (
         output["services"]["test_container"]["healthcheck"]["test"]
-        == "pg_isready -h 127.0.0.1 -p 5432 -U $$POSTGRES_USERNAME -d $$POSTGRES_DATABASE"
+        == "pg_isready -h 127.0.0.1 -p 5432 -U $$POSTGRES_USER -d $$POSTGRES_DB"
     )
 
 

diff --git a/library/2.0.0/tests/test_labels.py → library/2.0.1/tests/test_labels.py b/library/2.0.0/tests/test_labels.py → library/2.0.1/tests/test_labels.py
diff --git a/library/2.0.0/tests/test_notes.py → library/2.0.1/tests/test_notes.py b/library/2.0.0/tests/test_notes.py → library/2.0.1/tests/test_notes.py
diff --git a/library/2.0.0/tests/test_portal.py → library/2.0.1/tests/test_portal.py b/library/2.0.0/tests/test_portal.py → library/2.0.1/tests/test_portal.py
diff --git a/library/2.0.0/tests/test_ports.py → library/2.0.1/tests/test_ports.py b/library/2.0.0/tests/test_ports.py → library/2.0.1/tests/test_ports.py
diff --git a/library/2.0.0/tests/test_render.py → library/2.0.1/tests/test_render.py b/library/2.0.0/tests/test_render.py → library/2.0.1/tests/test_render.py
diff --git a/library/2.0.0/tests/test_resources.py → library/2.0.1/tests/test_resources.py b/library/2.0.0/tests/test_resources.py → library/2.0.1/tests/test_resources.py
diff --git a/library/2.0.0/tests/test_restart.py → library/2.0.1/tests/test_restart.py b/library/2.0.0/tests/test_restart.py → library/2.0.1/tests/test_restart.py
diff --git a/library/2.0.0/tests/test_volumes.py → library/2.0.1/tests/test_volumes.py b/library/2.0.0/tests/test_volumes.py → library/2.0.1/tests/test_volumes.py
diff --git a/library/2.0.0/validations.py → library/2.0.1/validations.py b/library/2.0.0/validations.py → library/2.0.1/validations.py
diff --git a/library/2.0.0/volume_mount.py → library/2.0.1/volume_mount.py b/library/2.0.0/volume_mount.py → library/2.0.1/volume_mount.py
diff --git a/library/2.0.0/volume_mount_types.py → library/2.0.1/volume_mount_types.py b/library/2.0.0/volume_mount_types.py → library/2.0.1/volume_mount_types.py
diff --git a/library/2.0.0/volume_sources.py → library/2.0.1/volume_sources.py b/library/2.0.0/volume_sources.py → library/2.0.1/volume_sources.py
diff --git a/library/2.0.0/volume_types.py → library/2.0.1/volume_types.py b/library/2.0.0/volume_types.py → library/2.0.1/volume_types.py
diff --git a/library/2.0.0/volumes.py → library/2.0.1/volumes.py b/library/2.0.0/volumes.py → library/2.0.1/volumes.py
diff --git a/library/hashes.yaml b/library/hashes.yaml
@@ -1,3 +1,3 @@
 0.0.1: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
 1.1.4: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
-2.0.0: 1d4f6760d7abd712271ff40ae0cabe3285f34a1f84c6922709d51f1f0bf5ce33
+2.0.1: 77e44b15832ac747aadc0d04c3eaac54cd0a9810cf761670b0215cb9c6aa7608