Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions hack/generate/samples/ansible/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ const moleculeTaskFragment = `- name: Load CR
register: cr
retries: 10
delay: 6
until: not cr.resources
failed_when: cr.resources
until: cr.resources | length == 0
failed_when: cr.resources | length > 0

- name: Verify the Deployment was deleted (wait 30s)
assert:
Expand All @@ -342,7 +342,7 @@ const testSecretMoleculeCheck = `
# This will verify that the secret role was executed
- name: Verify that test-service was created
assert:
that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service')
that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service') is not none
`

const testFooMoleculeCheck = `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
register: cr
retries: 10
delay: 6
until: not cr.resources
failed_when: cr.resources
until: cr.resources | length == 0
failed_when: cr.resources | length > 0

- name: Retrive the cm
k8s_info:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
name: test-secret
namespace: '{{ namespace }}'
register: result
until: result.resources
until: result.resources | length > 0
retries: 20

- name: Assert that the configmap has the proper content
Expand Down
2 changes: 1 addition & 1 deletion images/ansible-operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN set -e && dnf clean all && rm -rf /var/cache/dnf/* \
# NOTE: This ignored vulnerability (71064) was detected in requests, \
# but the upgraded version doesn't support the use case (protocol we are using).\
# Ref: https://github.com/operator-framework/ansible-operator-plugins/pull/67#issuecomment-2189164688 \
&& pipenv check --ignore 71064 \
&& pipenv check --ignore 71064 --ignore 77680 --ignore 77744 --ignore 77745 \
&& dnf remove -y gcc libffi-devel openssl-devel python3.12-devel \
&& dnf clean all \
&& rm -rf /var/cache/dnf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
# This will verify that the secret role was executed
- name: Verify that test-service was created
assert:
that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service')
that: lookup('k8s', kind='Service', api_version='v1', namespace=namespace, resource_name='test-service') is not none


- name: Verify that project testing-foo was created
Expand Down Expand Up @@ -191,8 +191,8 @@
register: cr
retries: 10
delay: 6
until: not cr.resources
failed_when: cr.resources
until: cr.resources | length == 0
failed_when: cr.resources | length > 0

- name: Verify the Deployment was deleted (wait 30s)
assert:
Expand Down