Skip to content

Various molecule scaffolding tweaks #3661

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
joelanford merged 1 commit into from
Aug 6, 2020
Merged

Various molecule scaffolding tweaks #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ namePrefix: osdk-

patchesStrategicMerge:
- manager_image.yaml
- pull_policy/Never.yaml
Copy link
Copy Markdown
Member Author

@asmacdo asmacdo Aug 6, 2020

Choose a reason for hiding this comment

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

This caused a conflict when running kustomize build for config/testing

- debug_logs_patch.yaml
- ../default/manager_auth_proxy_patch.yaml

Expand Down
6 changes: 5 additions & 1 deletion internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ const verifyTemplate = `---
collections:
- community.kubernetes

vars:
ctrl_label: control-plane=controller-manager

tasks:
- block:
- name: Import all test files from tasks/
Expand Down Expand Up @@ -71,7 +74,8 @@ const verifyTemplate = `---
k8s_log:
name: '{{ "{{ item.metadata.name }}" }}'
namespace: '{{ "{{ namespace }}" }}'
loop: "{{ "{{ q('k8s', api_version='v1', kind='Pod', namespace=namespace) }}" }}"
container: manager
loop: "{{ "{{ q('k8s', api_version='v1', kind='Pod', namespace=namespace, label_selector=ctrl_label) }}" }}"
Copy link
Copy Markdown
Member Author

@asmacdo asmacdo Aug 6, 2020

Choose a reason for hiding this comment

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

Accessing Pod logs was not working

register: debug_logs

- name: Output gathered resources
Expand Down
5 changes: 5 additions & 0 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/destroy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,9 @@ const destroyTemplate = `---
tasks:
- name: Destroy test kind cluster
command: kind delete cluster --name osdk-test --kubeconfig {{ "{{ kubeconfig }}" }}

- name: Unset pull policy
command: '{{ "{{ kustomize }}" }} edit remove patch pull_policy/{{ "{{ operator_pull_policy }}" }}.yaml'
Copy link
Copy Markdown
Member Author

@asmacdo asmacdo Aug 6, 2020

Choose a reason for hiding this comment

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

Cleanup was incomplete, could cause future kustomize conflicts.

args:
chdir: '{{ "{{ config_dir }}" }}/testing'
`