Skip to content

Fix undefined var in scaffolded molecule tests #3654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2020
Merged

Fix undefined var in scaffolded molecule tests #3654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e20aaa
Fix undefined var in scaffolded molecule tests
asmacdo Aug 5, 2020
cb25ebc
update kind localhost var to match var name
asmacdo Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/destroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
`
2 changes: 1 addition & 1 deletion internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/prepare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

@camilamacedo86 camilamacedo86 Aug 5, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it will be reverted?
I think @fabianvf changed that. Maybe is valid just ping him if you did not yet. :-)

Also, was it released in the alpha ones? If we we need to do a fragment file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a typo from me 😬, this is definitely a fix

kubeconfig: "{{ "{{ lookup('env', 'KUBECONFIG') }}" }}"
kustomize: ${KUSTOMIZE_PATH:-kustomize}
env:
Expand Down