replaced instances (#5249)

Signed-off-by: Venkat Ramaraju <[email protected]>

Author: VenkatRamaraju

changelog/fragments/bump-ansible-collections.yaml

@@ -0,0 +1,26 @@
+# entries is a list of entries to include in
+# release notes and/or the migration guide
+entries:
+  - description: >
+      Bumped community.kubernetes to kubernetes.core >= 2.2.0. Added the kubernetes.core collection to requirements.
+
+    # kind is one of:
+    # - addition
+    # - change
+    # - deprecation
+    # - removal
+    # - bugfix
+    kind: "change"
+
+    # Is this a breaking change?
+    breaking: false
+
+    # Migration can be defined to automatically add a section to
+    # the migration guide. This is required for breaking changes.
+    migration:
+      header: Update ansible collection ``community.kubernetes`` to ``kubernetes.core``
+      body: >
+        Add the ``kubernetes.core`` collection (>= 2.2.0) to the requrements.yml file
+
+        - name: kubernetes.core
+          version: "2.2.0"

hack/generate/samples/internal/ansible/advanced_molecule.go

@@ -88,7 +88,7 @@ func (ma *AdvancedMolecule) Run() {
 	const inventoryRoleTaskFragment = `
 - when: sentinel | test
   block:
-  - community.kubernetes.k8s:
+  - kubernetes.core.k8s:
       definition:
         apiVersion: v1
         kind: ConfigMap
@@ -274,7 +274,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
   tasks:
     - name: Get the decrypted message variable
       include_vars:
@@ -302,7 +302,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
   tasks:
     - name: Create configmap
       k8s:
@@ -336,7 +336,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
     - debug: msg='{{ "hello" | test }}'`
 	err = kbutil.ReplaceInFile(
 		filepath.Join(ma.ctx.Dir, "playbooks", "inventorytest.yml"),
-		"---\n- hosts: localhost\n  gather_facts: no\n  collections:\n    - community.kubernetes\n    - operator_sdk.util\n  tasks:\n    - import_role:\n        name: \"inventorytest\"",
+		"---\n- hosts: localhost\n  gather_facts: no\n  collections:\n    - kubernetes.core\n    - operator_sdk.util\n  tasks:\n    - import_role:\n        name: \"inventorytest\"",
 		inventoryPlaybook)
 	pkg.CheckError("adding playbook for inventorytest", err)
 
@@ -345,7 +345,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
   tasks:
     - name: retrieve configmap
       k8s_info:
@@ -403,7 +403,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
   tasks:
     - name: Create configmap
       k8s:
@@ -427,7 +427,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
     - operator_sdk.util
 
   tasks:
@@ -486,7 +486,7 @@ func (ma *AdvancedMolecule) updatePlaybooks() {
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
   tasks:
 
     - name: create externalnamespace
@@ -556,7 +556,7 @@ const originalPlaybookFragment = `---
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
     - operator_sdk.util
   tasks: []
 `

hack/generate/samples/internal/ansible/constants.go

@@ -16,7 +16,7 @@ package ansible
 
 const roleFragment = `
 - name: start memcached
-  community.kubernetes.k8s:
+  kubernetes.core.k8s:
     definition:
       kind: Deployment
       apiVersion: apps/v1
@@ -222,7 +222,7 @@ const originalTaskSecret = `---
 // false positive: G101: Potential hardcoded credentials (gosec)
 // nolint:gosec
 const taskForSecret = `- name: Create test service
-  community.kubernetes.k8s:
+  kubernetes.core.k8s:
     definition:
       kind: Service
       api_version: v1
@@ -309,7 +309,7 @@ const memcachedWithBlackListTask = `
     status:
       test: "hello world"
 
-- community.kubernetes.k8s:
+- kubernetes.core.k8s:
     definition:
       kind: Secret
       apiVersion: v1
@@ -320,10 +320,10 @@ const memcachedWithBlackListTask = `
         test: aGVsbG8K
 - name: Get cluster api_groups
   set_fact:
-    api_groups: "{{ lookup('community.kubernetes.k8s', cluster_info='api_groups', kubeconfig=lookup('env', 'K8S_AUTH_KUBECONFIG')) }}"
+    api_groups: "{{ lookup('kubernetes.core.k8s', cluster_info='api_groups', kubeconfig=lookup('env', 'K8S_AUTH_KUBECONFIG')) }}"
 
 - name: create project if projects are available
-  community.kubernetes.k8s:
+  kubernetes.core.k8s:
     definition:
       apiVersion: project.openshift.io/v1
       kind: Project
@@ -332,7 +332,7 @@ const memcachedWithBlackListTask = `
   when: "'project.openshift.io' in api_groups"
 
 - name: Create ConfigMap to test blacklisted watches
-  community.kubernetes.k8s:
+  kubernetes.core.k8s:
     definition:
       kind: ConfigMap
       apiVersion: v1
@@ -344,7 +344,7 @@ const memcachedWithBlackListTask = `
     state: present`
 
 const taskToDeleteConfigMap = `- name: delete configmap for test
-  community.kubernetes.k8s:
+  kubernetes.core.k8s:
     kind: ConfigMap
     api_version: v1
     name: deleteme

hack/generate/samples/internal/ansible/testdata/fixture_collection/roles/dummy/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: Create ConfigMap
-  community.kubernetes.k8s:
+  kubernetes.core.k8s:
     definition:
       kind: ConfigMap
       apiVersion: v1

hack/generate/samples/internal/ansible/testdata/secret.yml

@@ -2,7 +2,7 @@
 - hosts: localhost
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
 
   tasks:
     - meta: end_play

hack/tests/e2e-ansible-molecule.sh

@@ -29,8 +29,8 @@ trap_add "rm -rf $TMPDIR" EXIT
 pip3 install pyasn1==0.4.7 pyasn1-modules==0.2.6 idna==2.8 ipaddress==1.0.23
 pip3 install cryptography==3.3.2 molecule==3.0.2
 pip3 install ansible-lint yamllint
-pip3 install docker==4.2.2 openshift==0.11.2 jmespath
-ansible-galaxy collection install 'community.kubernetes:==1.1.1'
+pip3 install docker==4.2.2 openshift==0.12.1 jmespath
+ansible-galaxy collection install 'kubernetes.core:==2.2.0'
 
 header_text "Copying molecule testdata scenarios"
 ROOTDIR="$(pwd)"

internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/converge.go

@@ -42,7 +42,7 @@ const convergeTemplate = `---
   connection: local
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
 
   tasks:
     - name: Create Namespace

internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go

@@ -42,7 +42,7 @@ const destroyTemplate = `---
   connection: local
   gather_facts: false
   collections:
-    - community.kubernetes
+    - kubernetes.core
 
   tasks:
     - import_tasks: kustomize.yml

internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go

@@ -42,7 +42,7 @@ const verifyTemplate = `---
   connection: local
   gather_facts: no
   collections:
-    - community.kubernetes
+    - kubernetes.core
 
   vars:
     ctrl_label: control-plane=controller-manager

internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go

@@ -42,7 +42,7 @@ const destroyTemplate = `---
   connection: local
   gather_facts: false
   collections:
-    - community.kubernetes
+    - kubernetes.core
 
   tasks:
     - name: Destroy test kind cluster