From 5e20aaad10110cdbe1da016b4eb3b5965906bd06 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 5 Aug 2020 15:30:53 -0400 Subject: [PATCH 1/2] Fix undefined var in scaffolded molecule tests --- .../scaffolds/internal/templates/molecule/mdefault/destroy.go | 2 +- .../scaffolds/internal/templates/molecule/mdefault/prepare.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go index c4359143a9e..1f34f95f16c 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go @@ -57,7 +57,7 @@ const destroyTemplate = `--- state: absent - name: Unset pull policy - command: '{{ "{{ kustomize }}" }} edit remove patch pull_policy/{{ "{{ pull_policy }}" }}.yaml' + command: '{{ "{{ kustomize }}" }} edit remove patch pull_policy/{{ "{{ operator_pull_policy }}" }}.yaml' args: chdir: '{{ "{{ config_dir }}" }}/testing' ` diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go index 4638e836852..56cb7b3fa22 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go @@ -56,7 +56,7 @@ const prepareTemplate = `--- chdir: '{{ "{{ config_dir }}" }}/testing' - name: Set pull policy - command: '{{ "{{ kustomize }}" }} edit add patch pull_policy/{{ "{{ pull_policy }}" }}.yaml' + command: '{{ "{{ kustomize }}" }} edit add patch pull_policy/{{ "{{ operator_pull_policy }}" }}.yaml' args: chdir: '{{ "{{ config_dir }}" }}/testing' From cb25ebc3ed24abd852d6ac66d625f2499dd76bc0 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 5 Aug 2020 15:36:06 -0400 Subject: [PATCH 2/2] update kind localhost var to match var name --- .../v1/scaffolds/internal/templates/molecule/mkind/molecule.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go index f952d5e3a00..ad4a2f7e731 100644 --- a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go +++ b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go @@ -67,7 +67,7 @@ provisioner: samples_dir: ${MOLECULE_PROJECT_DIRECTORY}/config/samples project_dir: ${MOLECULE_PROJECT_DIRECTORY} operator_image: testing-operator - pull_policy: "Never" + operator_pull_policy: "Never" kubeconfig: "{{ "{{ lookup('env', 'KUBECONFIG') }}" }}" kustomize: ${KUSTOMIZE_PATH:-kustomize} env: