From b38e5ff03745e785e72dbb68d534af65b5765e44 Mon Sep 17 00:00:00 2001 From: Johnathan Kupferer Date: Wed, 19 Nov 2025 22:18:40 -0500 Subject: [PATCH 1/3] Fix github pages build --- .github/workflows/publish.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bc211d6..20fc8c6 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -60,8 +60,6 @@ jobs: publish-helm-charts: needs: publish - env: - IMAGE_NAME: poolboy runs-on: ubuntu-latest steps: - name: Checkout Source @@ -84,8 +82,8 @@ jobs: run: | helm dep up helm/ helm package helm/ - mv ${{ env.IMAGE_NAME }}-*.tgz gh-pages - helm repo index --url https://redhat-cop.github.io/${{ env.IMAGE_NAME }} gh-pages + mv ${{ vars.IMAGE_NAME }}-*.tgz gh-pages + helm repo index --url https://redhat-cop.github.io/${{ vars.IMAGE_NAME }} gh-pages - name: Push Changes to GH Pages run: | From f7936f474370039a4ccf9b8964fbed55873a0c65 Mon Sep 17 00:00:00 2001 From: Johnathan Kupferer Date: Wed, 19 Nov 2025 22:19:06 -0500 Subject: [PATCH 2/3] Fix to set parameter values on bind to handle --- operator/resourcehandle.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/operator/resourcehandle.py b/operator/resourcehandle.py index fcc3c8d..e0e5974 100644 --- a/operator/resourcehandle.py +++ b/operator/resourcehandle.py @@ -196,6 +196,14 @@ async def bind_handle_to_claim( } ] + # Update ResourceProvider to match ResourceClaim + if resource_claim.has_resource_provider: + patch.append({ + "op": "add", + "path": "/spec/provider", + "value": resource_claim.spec['provider'], + }) + # Set resource names and add any additional resources to handle for resource_index, claim_resource in enumerate(resource_claim_resources): resource_name = resource_claim_resources[resource_index].get('name') From ef5aa5fc6ce9dd4c959ad44adae75fbf471a224a Mon Sep 17 00:00:00 2001 From: Johnathan Kupferer Date: Wed, 19 Nov 2025 22:20:05 -0500 Subject: [PATCH 3/3] Fix command to run tests --- Development.adoc | 4 ++-- test/roles/poolboy_test_simple/tasks/test-finalizers-01.yaml | 3 +++ test/roles/poolboy_test_simple/tasks/test-parameters-01.yaml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Development.adoc b/Development.adoc index 87f1078..0907909 100644 --- a/Development.adoc +++ b/Development.adoc @@ -60,7 +60,7 @@ ansible-playbook \ -e poolboy_namespace=poolboy-dev \ -e poolboy_service_account=default \ -e poolboy_test_namespace=poolboy-dev-test \ --e poolboy_tests='["simple"]' \ +-e '{"poolboy_tests": ["simple"]}' \ test/playbook.yaml ---- @@ -129,7 +129,7 @@ ansible-playbook \ -e poolboy_namespace=poolboy-dev \ -e poolboy_service_account=poolboy-dev \ -e poolboy_test_namespace=poolboy-dev-test \ --e poolboy_tests='["simple"]' \ +-e '{"poolboy_tests": ["simple"]}' \ test/playbook.yaml ---- + diff --git a/test/roles/poolboy_test_simple/tasks/test-finalizers-01.yaml b/test/roles/poolboy_test_simple/tasks/test-finalizers-01.yaml index f39897c..fe4d2e8 100644 --- a/test/roles/poolboy_test_simple/tasks/test-finalizers-01.yaml +++ b/test/roles/poolboy_test_simple/tasks/test-finalizers-01.yaml @@ -155,4 +155,7 @@ register: r_get_resource_handle failed_when: >- r_get_resource_handle.resources | length != 0 + until: r_get_resource_handle is successful + retries: 5 + delay: 1 ... diff --git a/test/roles/poolboy_test_simple/tasks/test-parameters-01.yaml b/test/roles/poolboy_test_simple/tasks/test-parameters-01.yaml index 472b516..647c4d6 100644 --- a/test/roles/poolboy_test_simple/tasks/test-parameters-01.yaml +++ b/test/roles/poolboy_test_simple/tasks/test-parameters-01.yaml @@ -122,7 +122,7 @@ assert: that: - __state.spec.provider.name == 'test-parameters-01' - - __state.spec.provider.parameterValues == {"numbervar": 1} + - '__state.spec.provider.parameterValues == {"numbervar": 1, "stringvar": "one"}' - name: Verify creation of ResourceClaimTest test-parameters-01-a kubernetes.core.k8s_info: