From 9c4f4b0a2e0e14b85411126d78b10bebea9223be Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Thu, 21 Nov 2019 02:49:21 +0000 Subject: [PATCH 1/3] fix(ansible) : install jmespath in the contaner" --- ci/dockerfiles/ansible-e2e-hybrid.Dockerfile | 1 + ci/dockerfiles/ansible.Dockerfile | 1 + internal/scaffold/ansible/dockerfilehybrid.go | 1 + 3 files changed, 3 insertions(+) diff --git a/ci/dockerfiles/ansible-e2e-hybrid.Dockerfile b/ci/dockerfiles/ansible-e2e-hybrid.Dockerfile index ca659d71e8..572d849c93 100644 --- a/ci/dockerfiles/ansible-e2e-hybrid.Dockerfile +++ b/ci/dockerfiles/ansible-e2e-hybrid.Dockerfile @@ -32,6 +32,7 @@ RUN yum clean all && rm -rf /var/cache/yum/* \ ansible-runner-http==1.0.0 \ openshift==0.8.9 \ ansible~=2.8 \ + jmespath \ && yum remove -y gcc python36-devel \ && yum clean all \ && rm -rf /var/cache/yum diff --git a/ci/dockerfiles/ansible.Dockerfile b/ci/dockerfiles/ansible.Dockerfile index 7e47cf7d16..8c8f6eda61 100644 --- a/ci/dockerfiles/ansible.Dockerfile +++ b/ci/dockerfiles/ansible.Dockerfile @@ -31,6 +31,7 @@ RUN yum clean all && rm -rf /var/cache/yum/* \ ansible-runner-http==1.0.0 \ openshift==0.8.9 \ ansible~=2.8 \ + jmespath \ && yum remove -y gcc python36-devel \ && yum clean all \ && rm -rf /var/cache/yum diff --git a/internal/scaffold/ansible/dockerfilehybrid.go b/internal/scaffold/ansible/dockerfilehybrid.go index 983c1829bf..f5cce6e616 100644 --- a/internal/scaffold/ansible/dockerfilehybrid.go +++ b/internal/scaffold/ansible/dockerfilehybrid.go @@ -71,6 +71,7 @@ RUN yum clean all && rm -rf /var/cache/yum/* \ ansible-runner-http==1.0.0 \ openshift==0.8.9 \ ansible~=2.8 \ + jmespath \ && yum remove -y gcc python36-devel \ && yum clean all \ && rm -rf /var/cache/yum From d6a4d5d778aaa8cae17a2d04c4ca362c0430d6f0 Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Thu, 21 Nov 2019 03:01:28 +0000 Subject: [PATCH 2/3] CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17a04bf104..503056cca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Removed ### Bug Fixes +- Fix issue faced in the Ansible based operators when `jmespath` queries are used because it was not installed. ([#2252](https://github.com/operator-framework/operator-sdk/pull/2252)) ## v0.12.0 From 8517301c2f2216805c795814ec15b70db297792b Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Thu, 21 Nov 2019 03:03:03 +0000 Subject: [PATCH 3/3] add test --- test/ansible-memcached/secret/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/ansible-memcached/secret/tasks/main.yml b/test/ansible-memcached/secret/tasks/main.yml index 861dd089b6..5918ba4cf1 100644 --- a/test/ansible-memcached/secret/tasks/main.yml +++ b/test/ansible-memcached/secret/tasks/main.yml @@ -12,3 +12,9 @@ port: 8332 targetPort: 8332 name: rpc + +- name: Check if jmespath is installed + set_fact: + instance_tags: '{{app | json_query(query)}}' + vars: + query: 'app[*]."memcached"'