From a938aefffa6e3b71f6748911058711aa57685487 Mon Sep 17 00:00:00 2001 From: James Harmison Date: Mon, 17 May 2021 09:13:07 -0400 Subject: [PATCH 1/5] Convert all collection modules to fqcns --- molecule/default/converge.yml | 7 ++----- molecule/default/destroy.yml | 5 +---- molecule/default/kustomize.yml | 2 +- molecule/default/tasks/gitea_test.yml | 14 +++++++------- molecule/default/verify.yml | 9 +++------ 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 14e9cfc..9955329 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -3,18 +3,15 @@ hosts: localhost connection: local gather_facts: no - collections: - - community.kubernetes - tasks: - name: Create Namespace - k8s: + community.kubernetes.k8s: api_version: v1 kind: Namespace name: '{{ namespace }}' - name: Create alternate namespace - k8s: + community.kubernetes.k8s: api_version: v1 kind: Namespace name: '{{ namespace }}-alt' diff --git a/molecule/default/destroy.yml b/molecule/default/destroy.yml index 6cc33b5..9c875ca 100644 --- a/molecule/default/destroy.yml +++ b/molecule/default/destroy.yml @@ -3,16 +3,13 @@ hosts: localhost connection: local gather_facts: false - collections: - - community.kubernetes - tasks: - import_tasks: kustomize.yml vars: state: absent - name: Destroy Namespace - k8s: + community.kubernetes.k8s: api_version: v1 kind: Namespace name: '{{ namespace }}' diff --git a/molecule/default/kustomize.yml b/molecule/default/kustomize.yml index 4cac561..6d8790d 100644 --- a/molecule/default/kustomize.yml +++ b/molecule/default/kustomize.yml @@ -8,7 +8,7 @@ changed_when: false - name: Set resources to {{ state }} - k8s: + community.kubernetes.k8s: definition: '{{ item }}' state: '{{ state }}' wait: yes diff --git a/molecule/default/tasks/gitea_test.yml b/molecule/default/tasks/gitea_test.yml index b7bedd5..bd43a72 100644 --- a/molecule/default/tasks/gitea_test.yml +++ b/molecule/default/tasks/gitea_test.yml @@ -1,6 +1,6 @@ --- - name: Create the redhatgov.io/v1alpha1.Gitea - k8s: + community.kubernetes.k8s: state: present namespace: '{{ namespace }}' definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}" @@ -22,7 +22,7 @@ delay: 5 - name: Create the redhatgov.io/v1alpha1.GiteaUser - k8s: + community.kubernetes.k8s: state: present namespace: '{{ namespace }}' definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}" @@ -30,7 +30,7 @@ cr_file: 'redhatgov_v1alpha1_gitea_user_molecule.yaml' - name: Remove the redhatgov.io/v1alpha1.GiteaUser - k8s: + community.kubernetes.k8s: state: absent namespace: '{{ namespace }}' definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}" @@ -38,7 +38,7 @@ cr_file: 'redhatgov_v1alpha1_gitea_user_molecule.yaml' - name: Remove the redhatgov.io/v1alpha1.Gitea - k8s: + community.kubernetes.k8s: state: absent namespace: '{{ namespace }}' definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}" @@ -46,7 +46,7 @@ cr_file: 'redhatgov_v1alpha1_gitea_molecule.yaml' - name: Attempt to apply an invalid configurations for Gitea - k8s: + community.kubernetes.k8s: state: present namespace: '{{ namespace }}' definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml | combine(cr_fault) }}" @@ -84,7 +84,7 @@ that: False not in (faulty_crs | json_query('results[].failed') | list) - name: Apply the Gitea CR in an alternate namespace - k8s: + community.kubernetes.k8s: state: present namespace: '{{ namespace }}-alt' definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml | combine(namespace_mod) }}" @@ -96,7 +96,7 @@ name: gitea-sample-alt - name: Wait for CR to be Reconciled - k8s_info: + community.kubernetes.k8s_info: api_version: v1alpha1 kind: Gitea namespace: '{{ namespace }}-alt' diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 3affe7e..b9e3d01 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -3,9 +3,6 @@ hosts: localhost connection: local gather_facts: no - collections: - - community.kubernetes - vars: ctrl_label: control-plane=controller-manager @@ -17,7 +14,7 @@ - tasks/*_test.yml rescue: - name: Retrieve relevant resources - k8s_info: + community.kubernetes.k8s_info: api_version: '{{ item.api_version }}' kind: '{{ item.kind }}' namespace: '{{ namespace }}' @@ -34,7 +31,7 @@ ignore_errors: true - name: Retrieve controller Pod logs - k8s_log: + community.kubernetes.k8s_log: namespace: '{{ namespace }}' label_selectors: - '{{ ctrl_label }}' @@ -43,7 +40,7 @@ ignore_errors: true - name: Retrieve application Pod logs - k8s_log: + community.kubernetes.k8s_log: namespace: '{{ namespace }}' label_selectors: - app=gitea-testing From 41f55a4f30db691b7468e7e439c350445ddac7ea Mon Sep 17 00:00:00 2001 From: James Harmison Date: Mon, 17 May 2021 09:40:36 -0400 Subject: [PATCH 2/5] Added some debugs --- molecule/default/converge.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 9955329..af86bb9 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -4,6 +4,13 @@ connection: local gather_facts: no tasks: + - name: Confirm things are populated + debug: + var: + namespace: '{{ namespace }}' + KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}' + KUBECONFIG_CONTENT: '{{ lookup("file", lookup("env", "KUBECONFIG")) }}' + - name: Create Namespace community.kubernetes.k8s: api_version: v1 From bb3c119ea8d86ac8214e3a4d20242275452f3f9d Mon Sep 17 00:00:00 2001 From: James Harmison Date: Mon, 17 May 2021 09:46:16 -0400 Subject: [PATCH 3/5] Fix formatting of debug things --- molecule/default/converge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index af86bb9..b0411d8 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -6,7 +6,9 @@ tasks: - name: Confirm things are populated debug: - var: + var: debug_things + vars: + debug_things: namespace: '{{ namespace }}' KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}' KUBECONFIG_CONTENT: '{{ lookup("file", lookup("env", "KUBECONFIG")) }}' From c475c6d5abde9dc18a755a6ef66f2e93606cc041 Mon Sep 17 00:00:00 2001 From: James Harmison Date: Mon, 17 May 2021 16:31:19 -0400 Subject: [PATCH 4/5] Add early setup module to help troubleshoot --- molecule/kind/create.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/molecule/kind/create.yml b/molecule/kind/create.yml index d060380..fc3c8ad 100644 --- a/molecule/kind/create.yml +++ b/molecule/kind/create.yml @@ -4,6 +4,9 @@ connection: local gather_facts: false tasks: + - name: Output useful debugging info + setup: + - name: Install nginx Ingress onto kind command: > helm install kind-ingress ingress-nginx/ingress-nginx From b45b0aa2549582a82164fad9df4e180d51eec4f0 Mon Sep 17 00:00:00 2001 From: James Harmison Date: Mon, 17 May 2021 16:38:00 -0400 Subject: [PATCH 5/5] Actually output the stuff plx --- molecule/kind/create.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/molecule/kind/create.yml b/molecule/kind/create.yml index fc3c8ad..e3d99bc 100644 --- a/molecule/kind/create.yml +++ b/molecule/kind/create.yml @@ -4,8 +4,11 @@ connection: local gather_facts: false tasks: - - name: Output useful debugging info + - name: Gather useful debugging info setup: + - name: Output useful debugging info + debug: + var: ansible_facts - name: Install nginx Ingress onto kind command: >