Bläddra i källkod

add fqn to k8s modules

Grega Bremec 2 år sedan
förälder
incheckning
3256051085

+ 7 - 7
roles/deploy-central/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: is there already a subscription?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
@@ -10,7 +10,7 @@
   register: sub
 
 - name: oi - is there already an operator?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
@@ -34,7 +34,7 @@
   when: (csv is not defined) or (csv.resources is not defined) or (csv.resources | length == 0) or (csv.resources[0].status.phase != "Succeeded")
 
 - name: is there a central pod?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: v1
@@ -61,7 +61,7 @@
   when: not csv_is_there
 
 - name: wait until csv is there and ready
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
@@ -82,7 +82,7 @@
   when: not central_is_there
 
 - name: wait for central pod to be up
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: v1
@@ -97,7 +97,7 @@
   delay: 5
 
 - name: look up route
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: route.openshift.io/v1
@@ -121,7 +121,7 @@
     content: "{{ central_ep }}:443"
 
 - name: look up secret
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: v1

+ 7 - 7
roles/deploy-rhsso/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: is there already a subscription?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
@@ -10,7 +10,7 @@
   register: sub
 
 - name: oi - is there already an operator?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
@@ -34,7 +34,7 @@
   when: (csv is not defined) or (csv.resources is not defined) or (csv.resources | length == 0) or (csv.resources[0].status.phase != "Succeeded")
 
 - name: is there a rhsso pod?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: v1
@@ -64,7 +64,7 @@
   when: not csv_is_there
 
 - name: wait until csv is there and ready
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: operators.coreos.com/v1alpha1
@@ -85,7 +85,7 @@
   when: not rhsso_is_there
 
 - name: wait for rhsso pod to be up
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: v1
@@ -101,7 +101,7 @@
   delay: 5
 
 - name: look up route
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: route.openshift.io/v1
@@ -125,7 +125,7 @@
     content: "https://{{ rhsso_ep }}/auth/admin"
 
 - name: look up secret
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-ocp4"
     validate_certs: no
     api_version: v1

+ 5 - 5
roles/federate-clusters/tasks/main.yml

@@ -69,7 +69,7 @@
 
 # step 3: there is just you and me (wait for pods to pop up)
 - name: wait for sensor to show up
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: v1
@@ -85,7 +85,7 @@
   delay: 5
 
 - name: wait for admission-control to show up
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: v1
@@ -101,7 +101,7 @@
   delay: 5
 
 - name: wait for collector to show up
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: v1
@@ -118,7 +118,7 @@
 
 # step 4: i can give you more (any sort of corrections needed? pending pods?)
 - name: any pending pods?
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: v1
@@ -189,7 +189,7 @@
   delay: 5
 
 - name: scale admission controller to desired number
-  k8s:
+  kubernetes.core.k8s:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: apps/v1

+ 1 - 1
roles/federate-clusters/tasks/operator.yml

@@ -1,7 +1,7 @@
 ---
 # operator has its securedcluster resource
 - name: securedcluster cr check
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: platform.stackrox.io/v1alpha1

+ 1 - 1
roles/federate-clusters/tasks/roxctl.yml

@@ -6,7 +6,7 @@
   register: sensor_script_present
 
 - name: check for deployments anyway as well
-  k8s_info:
+  kubernetes.core.k8s_info:
     kubeconfig: "{{ ansible_facts['user_dir'] }}/kubeconfig-{{ cluster }}"
     validate_certs: no
     api_version: apps/v1