Skip to content
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
6 changes: 2 additions & 4 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ jobs:

publish-helm-charts:
needs: publish
env:
IMAGE_NAME: poolboy
runs-on: ubuntu-latest
steps:
- name: Checkout Source
Expand All @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions Development.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
----

Expand Down Expand Up @@ -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
----
+
Expand Down
8 changes: 8 additions & 0 deletions operator/resourcehandle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
3 changes: 3 additions & 0 deletions test/roles/poolboy_test_simple/tasks/test-finalizers-01.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
...
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down