mirror of
https://github.com/ansible-collections/kubernetes.core.git
synced 2026-05-07 13:32:37 +00:00
* fix(Collection's util resource discovery fails when complex subresources present #659) * fix(add changelog fragment) * update node image * Create discovery.yml * Update main.yml --------- Co-authored-by: Bastien Bosser <bastien.bosser@eviden.com> Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
This commit is contained in:
2
.github/workflows/integration-tests.yaml
vendored
2
.github/workflows/integration-tests.yaml
vendored
@@ -132,6 +132,8 @@ jobs:
|
|||||||
|
|
||||||
- name: create kubernetes cluster
|
- name: create kubernetes cluster
|
||||||
uses: helm/kind-action@v1.8.0
|
uses: helm/kind-action@v1.8.0
|
||||||
|
with:
|
||||||
|
node_image: "kindest/node:v1.29.2"
|
||||||
|
|
||||||
- name: Run integration tests
|
- name: Run integration tests
|
||||||
uses: ansible-network/github_actions/.github/actions/ansible_test_integration@main
|
uses: ansible-network/github_actions/.github/actions/ansible_test_integration@main
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
bugfixes:
|
||||||
|
- Resolve Collections util resource discovery fails when complex subresources present (https://github.com/ansible-collections/kubernetes.core/pull/676).
|
||||||
@@ -113,7 +113,7 @@ class Discoverer(kubernetes.dynamic.discovery.Discoverer):
|
|||||||
filter(lambda resource: "/" in resource["name"], resources_response)
|
filter(lambda resource: "/" in resource["name"], resources_response)
|
||||||
)
|
)
|
||||||
for subresource in subresources_raw:
|
for subresource in subresources_raw:
|
||||||
resource, name = subresource["name"].split("/")
|
resource, name = subresource["name"].split("/", 1)
|
||||||
subresources[resource][name] = subresource
|
subresources[resource][name] = subresource
|
||||||
|
|
||||||
for resource in resources_raw:
|
for resource in resources_raw:
|
||||||
|
|||||||
32
tests/integration/targets/k8s_info/tasks/discovery.yml
Normal file
32
tests/integration/targets/k8s_info/tasks/discovery.yml
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
---
|
||||||
|
# Testing fix for issue https://github.com/ansible-collections/kubernetes.core/pull/676
|
||||||
|
- vars:
|
||||||
|
kubevirt_release: "v1.1.1"
|
||||||
|
block:
|
||||||
|
- name: Delete existing namespace
|
||||||
|
kubernetes.core.k8s:
|
||||||
|
kind: namespace
|
||||||
|
namespace: kubevirt
|
||||||
|
state: absent
|
||||||
|
|
||||||
|
- name: Create kubevirt resources
|
||||||
|
kubernetes.core.k8s:
|
||||||
|
state: present
|
||||||
|
apply: true
|
||||||
|
src: "{{ item }}"
|
||||||
|
with_items:
|
||||||
|
- "https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_release }}/kubevirt-operator.yaml"
|
||||||
|
- "https://github.com/kubevirt/kubevirt/releases/download/{{ kubevirt_release }}/kubevirt-cr.yaml"
|
||||||
|
|
||||||
|
- name: Read kubevirt Deployment
|
||||||
|
k8s_info:
|
||||||
|
kind: Deployment
|
||||||
|
namespace: kubevirt
|
||||||
|
always:
|
||||||
|
- name: Delete existing namespace
|
||||||
|
kubernetes.core.k8s:
|
||||||
|
kind: namespace
|
||||||
|
namespace: kubevirt
|
||||||
|
state: absent
|
||||||
|
wait: true
|
||||||
|
ignore_errors: true
|
||||||
@@ -3,3 +3,4 @@
|
|||||||
with_items:
|
with_items:
|
||||||
- wait
|
- wait
|
||||||
- api-server-caching
|
- api-server-caching
|
||||||
|
- discovery
|
||||||
|
|||||||
Reference in New Issue
Block a user