Release 2.2.2 (#305)

Release 2.2.2

Reviewed-by: Abhijeet Kasurde <None>
Reviewed-by: Alina Buzachis <None>
Reviewed-by: None <None>

.zuul.d/network-ee-sanity-tests_non-voting.yaml

@@ -0,0 +1,10 @@
+- project:
+    name: github.com/ansible-collections/kubernetes.core
+    check:
+      jobs:
+        - network-ee-sanity-tests:
+            voting: false
+    gate:
+      jobs:
+        - network-ee-sanity-tests:
+            voting: false

CHANGELOG.rst

@@ -5,6 +5,22 @@ Kubernetes Collection Release Notes
 .. contents:: Topics
 
 
+v2.2.2
+======
+
+Bugfixes
+--------
+
+- remove binary file from k8s_cp test suite (https://github.com/ansible-collections/kubernetes.core/pull/298).
+
+v2.2.1
+======
+
+Bugfixes
+--------
+
+- common - Ensure the label_selectors parameter of _wait_for method is optional.
+
 v2.2.0
 ======
 

Makefile

@@ -1,5 +1,5 @@
 # Also needs to be updated in galaxy.yml
-VERSION = 2.2.0
+VERSION = 2.2.2
 
 TEST_ARGS ?= ""
 PYTHON_VERSION ?= `python -c 'import platform; print(".".join(platform.python_version_tuple()[0:2]))'`

README.md

@@ -85,7 +85,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible
 ---
 collections:
   - name: kubernetes.core
-    version: 2.2.0
+    version: 2.2.2
 ```
 
 ### Installing the Kubernetes Python Library

changelogs/changelog.yaml

@@ -486,3 +486,18 @@ releases:
         name: kustomize
         namespace: null
     release_date: '2021-09-15'
+  2.2.1:
+    changes:
+      bugfixes:
+      - common - Ensure the label_selectors parameter of _wait_for method is optional.
+    fragments:
+    - 0-copy_ignore_txt.yml
+    - _wait_for_label_selector_optional.yaml
+    release_date: '2021-10-18'
+  2.2.2:
+    changes:
+      bugfixes:
+      - remove binary file from k8s_cp test suite (https://github.com/ansible-collections/kubernetes.core/pull/298).
+    fragments:
+    - 298-remove-binary-file.yaml
+    release_date: '2021-12-07'

galaxy.yml

@@ -25,7 +25,7 @@ tags:
   - openshift
   - okd
   - cluster
-version: 2.2.0
+version: 2.2.2
 build_ignore:
   - .DS_Store
   - '*.tar.gz'

molecule/default/molecule.yml

@@ -33,7 +33,3 @@ scenario:
     - prepare
     - converge
     - verify
-dependency:
-  name: galaxy
-  options:
-    requirements-file: requirements.yml

molecule/default/roles/k8scopy/tasks/test_copy_file.yml

@@ -34,50 +34,65 @@
       kubectl_path: "{{ kubectl_path }}"
 
   # Binary file
-  - name: Generate random content
-    set_fact:
-      hello_arg: "{{ lookup('password', '/dev/null chars=ascii_lowercase,digits length=16') }}"
+
+  - name: Create temp binary file
+    tempfile:
+      state: file
+    register: binfile
+
+  - name: Generate random binary content
+    command: dd if=/dev/urandom of={{ binfile.path }} bs=1M count=1
 
   - name: Copy executable into Pod
     k8s_cp:
       namespace: '{{ copy_namespace }}'
       pod: '{{ pod_with_one_container.name }}'
       remote_path: /tmp/hello.exe
-      local_path: files/hello
+      local_path: "{{ binfile.path }}"
       state: to_pod
 
-  - name: Compare executable
-    kubectl_file_compare:
-      namespace: '{{ copy_namespace }}'
-      pod: '{{ pod_with_one_container.name }}'
-      remote_path: /tmp/hello.exe
-      local_path: "{{ role_path }}/files/hello"
-      kubectl_path: "{{ kubectl_path }}"
-      args:
-      - "{{ hello_arg }}"
+  - name: Get remote hash
+    kubernetes.core.k8s_exec:
+      namespace: "{{ copy_namespace }}"
+      pod: "{{ pod_with_one_container.name }}"
+      command: sha256sum -b /tmp/hello.exe
+    register: remote_hash
+
+  - name: Get local hash
+    command: sha256sum -b {{ binfile.path }}
+    register: local_hash
+
+  - assert:
+      that:
+      - remote_hash.stdout.split()[0] == local_hash.stdout.split()[0]
+
+  - name: Generate tempfile
+    tempfile:
+      state: file
+    register: binfile
 
   - name: Copy executable from Pod
     k8s_cp:
       namespace: '{{ copy_namespace }}'
       pod: '{{ pod_with_one_container.name }}'
       remote_path: /tmp/hello.exe
-      local_path: /tmp/hello
+      local_path: "{{ binfile.path }}"
       state: from_pod
 
-  - name: update executable permission
-    file:
-      path: /tmp/hello
-      mode: '0755'
+  - name: Get remote hash
+    kubernetes.core.k8s_exec:
+      namespace: "{{ copy_namespace }}"
+      pod: "{{ pod_with_one_container.name }}"
+      command: sha256sum -b /tmp/hello.exe
+    register: remote_hash
 
-  - name: Compare executable
-    kubectl_file_compare:
-      namespace: '{{ copy_namespace }}'
-      pod: '{{ pod_with_one_container.name }}'
-      remote_path: /tmp/hello.exe
-      local_path: /tmp/hello
-      kubectl_path: "{{ kubectl_path }}"
-      args:
-      - "{{ hello_arg }}"
+  - name: Get local hash
+    command: sha256sum -b {{ binfile.path }}
+    register: local_hash
+
+  - assert:
+      that:
+      - remote_hash.stdout.split()[0] == local_hash.stdout.split()[0]
 
   # zip files
   - name: copy zip file into remote pod

molecule/default/tasks/drain.yml

@@ -11,6 +11,17 @@
       kind: Namespace
       name: '{{ drain_namespace }}'
 
+  # It seems that the default ServiceAccount can take a bit to be created
+  # right after a cluster is brought up. This can lead to the ServiceAccount
+  # admission controller rejecting a Pod creation request because the
+  # ServiceAccount does not yet exist.
+  - name: Wait for default serviceaccount to be created
+    k8s_info:
+      kind: ServiceAccount
+      name: default
+      namespace: "{{ drain_namespace }}"
+      wait: yes
+
   - name: list cluster nodes
     k8s_info:
       kind: node

plugins/doc_fragments/k8s_resource_options.py

@@ -28,6 +28,6 @@ options:
     - Reads from the local file system. To read from the Ansible controller's file system, including vaulted files, use the file lookup
       plugin or template lookup plugin, combined with the from_yaml filter, and pass the result to
       I(resource_definition). See Examples below.
-    - Mutually exclusive with I(template) in case of M(k8s) module.
+    - Mutually exclusive with I(template) in case of M(kubernetes.core.k8s) module.
     type: path
 '''

plugins/module_utils/common.py

@@ -365,7 +365,7 @@ class K8sAnsibleMixin(object):
     def fail(self, msg=None):
         self.fail_json(msg=msg)
 
-    def _wait_for(self, resource, name, namespace, predicate, sleep, timeout, state, label_selectors):
+    def _wait_for(self, resource, name, namespace, predicate, sleep, timeout, state, label_selectors=None):
         start = datetime.now()
 
         def _wait_for_elapsed():

requirements.yml

@@ -1,3 +0,0 @@
-collections:
-  - name: cloud.common
-    version: ">=2.0.4"

tests/sanity/ignore-2.13.txt

@@ -0,0 +1,189 @@
+molecule/default/files/deployment.yaml yamllint!skip
+molecule/default/roles/helm/files/appversionless-chart-v2/templates/configmap.yaml yamllint!skip
+molecule/default/roles/helm/files/appversionless-chart/templates/configmap.yaml yamllint!skip
+molecule/default/roles/helm/files/test-chart-v2/templates/configmap.yaml yamllint!skip
+molecule/default/roles/helm/files/test-chart/templates/configmap.yaml yamllint!skip
+plugins/module_utils/__init__.py compile-2.7!skip
+plugins/module_utils/__init__.py compile-3.5!skip
+plugins/module_utils/__init__.py future-import-boilerplate!skip
+plugins/module_utils/__init__.py import-2.7!skip
+plugins/module_utils/__init__.py import-3.5!skip
+plugins/module_utils/__init__.py metaclass-boilerplate!skip
+plugins/module_utils/ansiblemodule.py compile-2.7!skip
+plugins/module_utils/ansiblemodule.py compile-3.5!skip
+plugins/module_utils/ansiblemodule.py future-import-boilerplate!skip
+plugins/module_utils/ansiblemodule.py import-2.7!skip
+plugins/module_utils/ansiblemodule.py import-3.5!skip
+plugins/module_utils/ansiblemodule.py metaclass-boilerplate!skip
+plugins/module_utils/apply.py compile-2.7!skip
+plugins/module_utils/apply.py compile-3.5!skip
+plugins/module_utils/apply.py future-import-boilerplate!skip
+plugins/module_utils/apply.py import-2.7!skip
+plugins/module_utils/apply.py import-3.5!skip
+plugins/module_utils/apply.py metaclass-boilerplate!skip
+plugins/module_utils/args_common.py compile-2.7!skip
+plugins/module_utils/args_common.py compile-3.5!skip
+plugins/module_utils/args_common.py future-import-boilerplate!skip
+plugins/module_utils/args_common.py import-2.7!skip
+plugins/module_utils/args_common.py import-3.5!skip
+plugins/module_utils/args_common.py metaclass-boilerplate!skip
+plugins/module_utils/client/discovery.py future-import-boilerplate!skip
+plugins/module_utils/client/discovery.py import-2.7!skip
+plugins/module_utils/client/discovery.py import-3.5!skip
+plugins/module_utils/client/discovery.py import-3.6!skip
+plugins/module_utils/client/discovery.py import-3.7!skip
+plugins/module_utils/client/discovery.py import-3.8!skip
+plugins/module_utils/client/discovery.py import-3.9!skip
+plugins/module_utils/client/discovery.py import-3.10!skip
+plugins/module_utils/client/discovery.py metaclass-boilerplate!skip
+molecule/default/roles/k8scopy/library/kubectl_file_compare.py shebang
+molecule/default/roles/k8scopy/library/k8s_create_file.py shebang
+plugins/module_utils/client/resource.py import-2.7!skip
+plugins/module_utils/client/resource.py import-3.5!skip
+plugins/module_utils/client/resource.py import-3.6!skip
+plugins/module_utils/client/resource.py import-3.7!skip
+plugins/module_utils/client/resource.py import-3.8!skip
+plugins/module_utils/client/resource.py import-3.9!skip
+plugins/module_utils/client/resource.py import-3.10!skip
+plugins/module_utils/common.py compile-2.7!skip
+plugins/module_utils/common.py compile-3.5!skip
+plugins/module_utils/common.py future-import-boilerplate!skip
+plugins/module_utils/common.py import-2.7!skip
+plugins/module_utils/common.py import-3.5!skip
+plugins/module_utils/common.py metaclass-boilerplate!skip
+plugins/module_utils/exceptions.py compile-2.7!skip
+plugins/module_utils/exceptions.py compile-3.5!skip
+plugins/module_utils/exceptions.py future-import-boilerplate!skip
+plugins/module_utils/exceptions.py import-2.7!skip
+plugins/module_utils/exceptions.py import-3.5!skip
+plugins/module_utils/exceptions.py metaclass-boilerplate!skip
+plugins/module_utils/hashes.py compile-2.7!skip
+plugins/module_utils/hashes.py compile-3.5!skip
+plugins/module_utils/hashes.py future-import-boilerplate!skip
+plugins/module_utils/hashes.py import-2.7!skip
+plugins/module_utils/hashes.py import-3.5!skip
+plugins/module_utils/hashes.py metaclass-boilerplate!skip
+plugins/module_utils/helm.py compile-2.7!skip
+plugins/module_utils/helm.py compile-3.5!skip
+plugins/module_utils/helm.py future-import-boilerplate!skip
+plugins/module_utils/helm.py import-2.7!skip
+plugins/module_utils/helm.py import-3.5!skip
+plugins/module_utils/helm.py metaclass-boilerplate!skip
+plugins/module_utils/k8sdynamicclient.py compile-2.7!skip
+plugins/module_utils/k8sdynamicclient.py compile-3.5!skip
+plugins/module_utils/k8sdynamicclient.py future-import-boilerplate!skip
+plugins/module_utils/k8sdynamicclient.py import-2.7!skip
+plugins/module_utils/k8sdynamicclient.py import-3.5!skip
+plugins/module_utils/k8sdynamicclient.py import-3.6!skip
+plugins/module_utils/k8sdynamicclient.py import-3.7!skip
+plugins/module_utils/k8sdynamicclient.py import-3.8!skip
+plugins/module_utils/k8sdynamicclient.py import-3.9!skip
+plugins/module_utils/k8sdynamicclient.py import-3.10!skip
+plugins/module_utils/k8sdynamicclient.py metaclass-boilerplate!skip
+plugins/modules/__init__.py compile-2.7!skip
+plugins/modules/__init__.py compile-3.5!skip
+plugins/modules/__init__.py future-import-boilerplate!skip
+plugins/modules/__init__.py import-2.7!skip
+plugins/modules/__init__.py import-3.5!skip
+plugins/modules/__init__.py metaclass-boilerplate!skip
+plugins/modules/helm.py compile-2.7!skip
+plugins/modules/helm.py compile-3.5!skip
+plugins/modules/helm.py future-import-boilerplate!skip
+plugins/modules/helm.py import-2.7!skip
+plugins/modules/helm.py import-3.5!skip
+plugins/modules/helm.py metaclass-boilerplate!skip
+plugins/modules/helm_info.py compile-2.7!skip
+plugins/modules/helm_info.py compile-3.5!skip
+plugins/modules/helm_info.py future-import-boilerplate!skip
+plugins/modules/helm_info.py import-2.7!skip
+plugins/modules/helm_info.py import-3.5!skip
+plugins/modules/helm_info.py metaclass-boilerplate!skip
+plugins/modules/helm_plugin.py compile-2.7!skip
+plugins/modules/helm_plugin.py compile-3.5!skip
+plugins/modules/helm_plugin.py future-import-boilerplate!skip
+plugins/modules/helm_plugin.py import-2.7!skip
+plugins/modules/helm_plugin.py import-3.5!skip
+plugins/modules/helm_plugin.py metaclass-boilerplate!skip
+plugins/modules/helm_plugin_info.py compile-2.7!skip
+plugins/modules/helm_plugin_info.py compile-3.5!skip
+plugins/modules/helm_plugin_info.py future-import-boilerplate!skip
+plugins/modules/helm_plugin_info.py import-2.7!skip
+plugins/modules/helm_plugin_info.py import-3.5!skip
+plugins/modules/helm_plugin_info.py metaclass-boilerplate!skip
+plugins/modules/helm_repository.py compile-2.7!skip
+plugins/modules/helm_repository.py compile-3.5!skip
+plugins/modules/helm_repository.py future-import-boilerplate!skip
+plugins/modules/helm_repository.py import-2.7!skip
+plugins/modules/helm_repository.py import-3.5!skip
+plugins/modules/helm_repository.py metaclass-boilerplate!skip
+plugins/modules/helm_template.py compile-2.7!skip
+plugins/modules/helm_template.py compile-3.5!skip
+plugins/modules/helm_template.py future-import-boilerplate!skip
+plugins/modules/helm_template.py import-2.7!skip
+plugins/modules/helm_template.py import-3.5!skip
+plugins/modules/helm_template.py metaclass-boilerplate!skip
+plugins/modules/k8s.py compile-2.7!skip
+plugins/modules/k8s.py compile-3.5!skip
+plugins/modules/k8s.py future-import-boilerplate!skip
+plugins/modules/k8s.py import-2.7!skip
+plugins/modules/k8s.py import-3.5!skip
+plugins/modules/k8s.py metaclass-boilerplate!skip
+plugins/modules/k8s.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s.py validate-modules:return-syntax-error
+plugins/modules/k8s_cluster_info.py compile-2.7!skip
+plugins/modules/k8s_cluster_info.py compile-3.5!skip
+plugins/modules/k8s_cluster_info.py future-import-boilerplate!skip
+plugins/modules/k8s_cluster_info.py import-2.7!skip
+plugins/modules/k8s_cluster_info.py import-3.5!skip
+plugins/modules/k8s_cluster_info.py metaclass-boilerplate!skip
+plugins/modules/k8s_exec.py compile-2.7!skip
+plugins/modules/k8s_exec.py compile-3.5!skip
+plugins/modules/k8s_exec.py future-import-boilerplate!skip
+plugins/modules/k8s_exec.py import-2.7!skip
+plugins/modules/k8s_exec.py import-3.5!skip
+plugins/modules/k8s_exec.py metaclass-boilerplate!skip
+plugins/modules/k8s_info.py compile-2.7!skip
+plugins/modules/k8s_info.py compile-3.5!skip
+plugins/modules/k8s_info.py future-import-boilerplate!skip
+plugins/modules/k8s_info.py import-2.7!skip
+plugins/modules/k8s_info.py import-3.5!skip
+plugins/modules/k8s_info.py metaclass-boilerplate!skip
+plugins/modules/k8s_json_patch.py compile-2.7!skip
+plugins/modules/k8s_json_patch.py compile-3.5!skip
+plugins/modules/k8s_json_patch.py future-import-boilerplate!skip
+plugins/modules/k8s_json_patch.py import-2.7!skip
+plugins/modules/k8s_json_patch.py import-3.5!skip
+plugins/modules/k8s_json_patch.py metaclass-boilerplate!skip
+plugins/modules/k8s_log.py compile-2.7!skip
+plugins/modules/k8s_log.py compile-3.5!skip
+plugins/modules/k8s_log.py future-import-boilerplate!skip
+plugins/modules/k8s_log.py import-2.7!skip
+plugins/modules/k8s_log.py import-3.5!skip
+plugins/modules/k8s_log.py metaclass-boilerplate!skip
+plugins/modules/k8s_rollback.py compile-2.7!skip
+plugins/modules/k8s_rollback.py compile-3.5!skip
+plugins/modules/k8s_rollback.py future-import-boilerplate!skip
+plugins/modules/k8s_rollback.py import-2.7!skip
+plugins/modules/k8s_rollback.py import-3.5!skip
+plugins/modules/k8s_rollback.py metaclass-boilerplate!skip
+plugins/modules/k8s_scale.py compile-2.7!skip
+plugins/modules/k8s_scale.py compile-3.5!skip
+plugins/modules/k8s_scale.py future-import-boilerplate!skip
+plugins/modules/k8s_scale.py import-2.7!skip
+plugins/modules/k8s_scale.py import-3.5!skip
+plugins/modules/k8s_scale.py metaclass-boilerplate!skip
+plugins/modules/k8s_scale.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s_scale.py validate-modules:return-syntax-error
+plugins/modules/k8s_service.py compile-2.7!skip
+plugins/modules/k8s_service.py compile-3.5!skip
+plugins/modules/k8s_service.py future-import-boilerplate!skip
+plugins/modules/k8s_service.py import-2.7!skip
+plugins/modules/k8s_service.py import-3.5!skip
+plugins/modules/k8s_service.py metaclass-boilerplate!skip
+plugins/modules/k8s_service.py validate-modules:parameter-type-not-in-doc
+plugins/modules/k8s_service.py validate-modules:return-syntax-error
+tests/sanity/refresh_ignore_files shebang!skip
+plugins/modules/k8s_cp.py compile-2.7!skip
+plugins/modules/k8s_cp.py import-2.7!skip
+plugins/module_utils/selector.py future-import-boilerplate!skip
+plugins/module_utils/selector.py metaclass-boilerplate!skip

tests/unit/module_utils/test_helm.py

@@ -41,7 +41,7 @@ def test_write_temp_kubeconfig_server_only():
     file_name = write_temp_kubeconfig("ff")
     try:
         with open(file_name, "r") as fd:
-            content = yaml.load(fd)
+            content = yaml.safe_load(fd)
     finally:
         os.remove(file_name)
 
@@ -60,7 +60,7 @@ def test_write_temp_kubeconfig_server_inscure_certs():
     file_name = write_temp_kubeconfig("ff", False, "my-certificate")
     try:
         with open(file_name, "r") as fd:
-            content = yaml.load(fd)
+            content = yaml.safe_load(fd)
     finally:
         os.remove(file_name)