Rebase pull request

ansible-collections · Sep 23, 2022 · 67a42b5 · 67a42b5
1 parent 12ed968
commit 67a42b5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git a/plugins/module_utils/k8s/runner.py b/plugins/module_utils/k8s/runner.py
@@ -1,7 +1,6 @@
 # Copyright: (c) 2021, Red Hat | Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from os import TMP_MAX
 from typing import Dict
 
 from ansible.module_utils._text import to_native

diff --git a/.../k8s_delete/templates/deployments.yaml.j2 → ...targets/k8s_delete/files/deployments.yaml b/.../k8s_delete/templates/deployments.yaml.j2 → ...targets/k8s_delete/files/deployments.yaml
@@ -67,4 +67,4 @@ spec:
         command:
         - /bin/sh
         - -c
-        - while true;do date;sleep 5; done
+        - while true;do date;sleep 5; done
diff --git a/tests/integration/targets/k8s_delete/tasks/main.yml b/tests/integration/targets/k8s_delete/tasks/main.yml
@@ -125,7 +125,7 @@
     - name: Create deployments
       k8s:
         namespace: "{{ test_namespace }}"
-        template: deployments.yaml.j2
+        src: files/deployments.yaml
         wait: true
       register: result
 

diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
@@ -578,3 +578,5 @@ tests/integration/targets/k8s_copy/library/kubectl_file_compare.py compile-3.5!s
 tests/integration/targets/helm/library/helm_test_version.py compile-2.6!skip
 tests/integration/targets/helm/library/helm_test_version.py compile-2.7!skip
 tests/integration/targets/helm/library/helm_test_version.py compile-3.5!skip
+tests/integration/targets/k8s_patched/files/deployments.yaml yamllint!skip
+tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt
@@ -29,3 +29,5 @@ plugins/modules/k8s.py validate-modules:return-syntax-error
 plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
+tests/integration/targets/k8s_patched/files/deployments.yaml yamllint!skip
+tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
diff --git a/tests/sanity/ignore-2.13.txt b/tests/sanity/ignore-2.13.txt
@@ -29,3 +29,5 @@ plugins/modules/k8s.py validate-modules:return-syntax-error
 plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
+tests/integration/targets/k8s_patched/files/deployments.yaml yamllint!skip
+tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip
diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt
@@ -29,3 +29,5 @@ plugins/modules/k8s.py validate-modules:return-syntax-error
 plugins/modules/k8s_scale.py validate-modules:return-syntax-error
 plugins/modules/k8s_service.py validate-modules:return-syntax-error
 plugins/modules/k8s_taint.py validate-modules:return-syntax-error
+tests/integration/targets/k8s_patched/files/deployments.yaml yamllint!skip
+tests/integration/targets/k8s_delete/files/deployments.yaml yamllint!skip