diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf960e6..dfbd03c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python_version: ['2.7', '3.7'] + python_version: ['3.7'] steps: - name: Check out code uses: actions/checkout@v2 @@ -46,6 +46,8 @@ jobs: - name: Set up KinD cluster uses: engineerd/setup-kind@v0.5.0 + with: + version: v0.17.0 - name: Set up Python ${{ matrix.python_version }} uses: actions/setup-python@v1 diff --git a/plugins/modules/k8s_event.py b/plugins/modules/k8s_event.py index 0f98e1f..95f2ebb 100644 --- a/plugins/modules/k8s_event.py +++ b/plugins/modules/k8s_event.py @@ -277,12 +277,13 @@ def execute_module(self): involved_obj = self.params.get("involvedObject") if involved_obj: try: - involved_object_resource = find_resource(self.client, involved_obj["kind"], "v1") - api_involved_object = involved_object_resource.get( - name=involved_obj["name"], namespace=involved_obj["namespace"]) + involved_object_resource = find_resource(self.client, involved_obj["kind"], involved_obj.get("apiVersion", "v1")) + if involved_object_resource: + api_involved_object = involved_object_resource.get( + name=involved_obj["name"], namespace=involved_obj["namespace"]) - involved_obj["uid"] = api_involved_object["metadata"]["uid"] - involved_obj["resourceVersion"] = api_involved_object["metadata"]["resourceVersion"] + involved_obj["uid"] = api_involved_object["metadata"]["uid"] + involved_obj["resourceVersion"] = api_involved_object["metadata"]["resourceVersion"] except openshift.dynamic.exceptions.NotFoundError: pass