From 3543c5e16a7cb1743971b1ee808930f00382d16f Mon Sep 17 00:00:00 2001 From: Liran Rotenberg Date: Thu, 5 Oct 2023 12:24:57 +0300 Subject: [PATCH] futher changes Signed-off-by: Liran Rotenberg --- docs/hooks.md | 2 +- operator/molecule/default/verify.yml | 6 +++--- operator/roles/forkliftcontroller/tasks/main.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/hooks.md b/docs/hooks.md index d3bab34f6..f578ff985 100644 --- a/docs/hooks.md +++ b/docs/hooks.md @@ -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 diff --git a/operator/molecule/default/verify.yml b/operator/molecule/default/verify.yml index 15f3674dd..d13e15903 100644 --- a/operator/molecule/default/verify.yml +++ b/operator/molecule/default/verify.yml @@ -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 }}' @@ -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 diff --git a/operator/roles/forkliftcontroller/tasks/main.yml b/operator/roles/forkliftcontroller/tasks/main.yml index f650b59fe..6ba61d8cd 100644 --- a/operator/roles/forkliftcontroller/tasks/main.yml +++ b/operator/roles/forkliftcontroller/tasks/main.yml @@ -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: @@ -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: