Skip to content
This repository was archived by the owner on Nov 18, 2020. It is now read-only.

Commit fe285e2

Browse files
Update Ansible to SDK 0.14.1 (#107)
* Update Ansible to SDK 0.14.1
1 parent 942c977 commit fe285e2

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

ansible/memcached-operator/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/operator-framework/ansible-operator:v0.13.0
1+
FROM quay.io/operator-framework/ansible-operator:v0.14.1
22

33
COPY watches.yaml ${HOME}/watches.yaml
44

ansible/memcached-operator/molecule/default/asserts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
ansible_python_interpreter: '{{ ansible_playbook_python }}'
88
tasks:
99
- name: Get all pods in {{ namespace }}
10-
k8s_facts:
10+
k8s_info:
1111
api_version: v1
1212
kind: Pod
1313
namespace: '{{ namespace }}'

ansible/memcached-operator/molecule/test-cluster/playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
msg: "{{ lookup('k8s', group='cache.example.com', api_version='v1alpha1', kind='Memcached', namespace=namespace, resource_name=custom_resource.metadata.name) }}"
2020

2121
- name: Wait 2m for reconciliation to run
22-
k8s_facts:
22+
k8s_info:
2323
api_version: 'v1alpha1'
2424
kind: 'Memcached'
2525
namespace: '{{ namespace }}'

ansible/memcached-operator/molecule/test-local/playbook.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
when: hostvars[groups.k8s.0].build_cmd.changed
3737

3838
- name: Wait 30s for Operator Deployment to terminate
39-
k8s_facts:
39+
k8s_info:
4040
api_version: '{{ definition.apiVersion }}'
4141
kind: '{{ definition.kind }}'
4242
namespace: '{{ namespace }}'
@@ -61,7 +61,7 @@
6161
definition: '{{ custom_resource }}'
6262

6363
- name: Wait 2m for reconciliation to run
64-
k8s_facts:
64+
k8s_info:
6565
api_version: '{{ custom_resource.apiVersion }}'
6666
kind: '{{ custom_resource.kind }}'
6767
namespace: '{{ namespace }}'

ansible/memcached-operator/roles/Memcached/meta/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ galaxy_info:
1616
# - CC-BY
1717
license: license (GPLv2, CC-BY, etc)
1818

19-
min_ansible_version: 2.6
19+
min_ansible_version: 2.9
2020

2121
# If this a Container Enabled role, provide the minimum Ansible Container version.
2222
# min_ansible_container_version:
@@ -57,4 +57,6 @@ galaxy_info:
5757

5858
dependencies: []
5959
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
60-
# if you add dependencies to this list.
60+
# if you add dependencies to this list.
61+
collections:
62+
- operator_sdk.util

0 commit comments

Comments
 (0)