Skip to content

Commit

Permalink
futher changes
Browse files Browse the repository at this point in the history
Signed-off-by: Liran Rotenberg <[email protected]>
  • Loading branch information
liranr23 committed Oct 5, 2023
1 parent 2439d9d commit 3543c5e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/hooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The playbook encoded here does the following:
environment:
HOME: "{{ ansible_facts.getent_passwd[ansible_user_id][4] }}"
- k8s_info:
- kubernetes.core.k8s_info:
api_version: v1
kind: Secret
name: ssh-credentials
Expand Down
6 changes: 3 additions & 3 deletions operator/molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
- tasks/*_test.yml
rescue:
- name: Retrieve relevant resources
k8s_info:
kubernetes.core.k8s_info:
api_version: '{{ item.api_version }}'
kind: '{{ item.kind }}'
namespace: '{{ namespace }}'
Expand All @@ -33,11 +33,11 @@
register: debug_resources

- name: Retrieve Pod logs
k8s_log:
kubernetes.core.k8s_log:
name: '{{ item.metadata.name }}'
namespace: '{{ namespace }}'
container: manager
loop: "{{ q('k8s', api_version='v1', kind='Pod', namespace=namespace, label_selector=ctrl_label) }}"
loop: "{{ q('kubernetes.core.k8s', api_version='v1', kind='Pod', namespace=namespace, label_selector=ctrl_label) }}"
register: debug_logs

- name: Output gathered resources
Expand Down
6 changes: 3 additions & 3 deletions operator/roles/forkliftcontroller/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

- name: "Load cluster API groups"
set_fact:
api_groups: "{{ lookup('k8s', cluster_info='api_groups') }}"
api_groups: "{{ lookup('kubernetes.core.k8s', cluster_info='api_groups') }}"

- when: "'route.openshift.io' not in api_groups"
block:
Expand All @@ -33,13 +33,13 @@

- name: "Obtain k8s cluster version"
set_fact:
k8s_cluster_version: "{{ lookup('k8s', cluster_info='version').kubernetes.gitVersion }}"
k8s_cluster_version: "{{ lookup('kubernetes.core.k8s', cluster_info='version').kubernetes.gitVersion }}"

- when: not k8s_cluster|bool
block:
- name: "Get cluster proxy object"
set_fact:
proxy_cluster: "{{ lookup('k8s', api_version='config.openshift.io/v1', kind='Proxy', resource_name='cluster') }}"
proxy_cluster: "{{ lookup('kubernetes.core.k8s', api_version='config.openshift.io/v1', kind='Proxy', resource_name='cluster') }}"

- when: proxy_cluster.spec.trustedCA.name|length > 0
block:
Expand Down

0 comments on commit 3543c5e

Please sign in to comment.