fix path to kubernetes operator script

Signed-off-by: anandrkskd <[email protected]>
anandrkskd · Jan 19, 2023 · 0a574b9 · 0a574b9
1 parent 3263e74
commit 0a574b9
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/infra-test-kubernetes.yaml b/.github/workflows/infra-test-kubernetes.yaml
@@ -40,12 +40,13 @@ jobs:
         CLUSTER=`ibmcloud ks cluster get -c odo-test-kubernetes-cluster --output json `
         ID=$(echo $CLUSTER | jq -r '.id')
         ibmcloud ks cluster config --cluster $ID --admin
+        pip3 install kubernetes
 
     - name: install operators
       uses: dawidd6/action-ansible-playbook@v2
       env:
         IC_API_KEY: ${{ secrets.IC_API_KEY }}
         IC_REGION: 'eu-de'
       with:
-        playbook: scripts/ansible/Cluster/kubernetes-cluster/operator-kubernetes.yml
+        playbook: scripts/ansible/Cluster/kubernetes-cluster/operators-kubernetes.yml
         requirements: scripts/ansible/Cluster/kubernetes-cluster/requirements.yml
diff --git a/.github/workflows/infra-test-openshift.yaml b/.github/workflows/infra-test-openshift.yaml
@@ -41,12 +41,13 @@ jobs:
         ID=$(echo $CLUSTER | jq -r '.id')
         URL=$(echo $CLUSTER| jq -r '.serviceEndpoints.publicServiceEndpointURL')
         ibmcloud oc cluster config --cluster $ID --admin
+        pip3 install kubernetes
         
     - name: install operators
       uses: dawidd6/action-ansible-playbook@v2
       env:
         IC_API_KEY: ${{ secrets.IC_API_KEY }}
         IC_REGION: 'eu-de'
       with:
-        playbook: scripts/ansible/Cluster/openshift-cluster/operator-openshift.yml
+        playbook: scripts/ansible/Cluster/openshift-cluster/operators-openshift.yml
         requirements: scripts/ansible/Cluster/openshift-cluster/requirements.yml
diff --git a/.github/workflows/infra-test-windows.yaml b/.github/workflows/infra-test-windows.yaml
@@ -41,12 +41,13 @@ jobs:
         ID=$(echo $CLUSTER | jq -r '.id')
         URL=$(echo $CLUSTER| jq -r '.serviceEndpoints.publicServiceEndpointURL')
         ibmcloud oc cluster config --cluster $ID --admin
+        pip3 install kubernetes
 
     - name: install operators
       uses: dawidd6/action-ansible-playbook@v2
       env:
         IC_API_KEY: ${{ secrets.IC_API_KEY }}
         IC_REGION: 'eu-de'
       with:
-        playbook: scripts/ansible/Cluster/windows-openshift-cluster/operator-kubernetes.yml
+        playbook: scripts/ansible/Cluster/windows-openshift-cluster/operators-openshift.yml
         requirements: scripts/ansible/Cluster/windows-openshift-cluster/requirements.yml
diff --git a/scripts/ansible/Cluster/kubernetes-cluster/operators-kubernetes.yml b/scripts/ansible/Cluster/kubernetes-cluster/operators-kubernetes.yml
@@ -1,12 +1,11 @@
 ---
 - name: Install Operators on Kubernetes Cluster
   hosts: localhost
-  collections:
-   - community.kubernetes
+
   tasks:
 
   - name: Create a Subscription for Service Binding Operator
-    k8s:
+    kubernetes.core.k8s:
       state: present
       definition:
         apiVersion: operators.coreos.com/v1alpha1
@@ -20,7 +19,7 @@
           source: operatorhubio-catalog
           sourceNamespace: olm
   - name: Create a Subscription for EDB Postgresql Operator
-    k8s:
+    kubernetes.core.k8s:
       state: present
       definition:
         apiVersion: operators.coreos.com/v1alpha1

diff --git a/scripts/ansible/Cluster/kubernetes-cluster/requirements.yml b/scripts/ansible/Cluster/kubernetes-cluster/requirements.yml
@@ -1,5 +1,5 @@
 ---
 collections:
 - ibm.cloudcollection
-- name: community.kubernetes
+- name: kubernetes.core
   version: 2.0.0
diff --git a/scripts/ansible/Cluster/openshift-cluster/operators-openshift.yml b/scripts/ansible/Cluster/openshift-cluster/operators-openshift.yml
@@ -1,12 +1,10 @@
 ---
 - name: Install Operators on Kubernetes Cluster
   hosts: localhost
-  collections:
-   - community.kubernetes
   tasks:
 
   - name: Create a Subscription for Service Binding Operator
-    k8s:
+    kubernetes.core.k8s:
       state: present
       definition:
         apiVersion: operators.coreos.com/v1alpha1
@@ -20,7 +18,7 @@
           source: redhat-operators
           sourceNamespace: openshift-marketplace
   - name: Create a Subscription for EDB Postgresql Operator
-    k8s:
+    kubernetes.core.k8s:
       state: present
       definition:
         apiVersion: operators.coreos.com/v1alpha1

diff --git a/scripts/ansible/Cluster/openshift-cluster/requirements.yml b/scripts/ansible/Cluster/openshift-cluster/requirements.yml
@@ -1,5 +1,5 @@
 ---
 collections:
 - ibm.cloudcollection
-- name: community.kubernetes
+- name: kubernetes.core
   version: 2.0.0
diff --git a/scripts/ansible/Cluster/windows-openshift-cluster/operators-openshift.yml b/scripts/ansible/Cluster/windows-openshift-cluster/operators-openshift.yml
@@ -1,12 +1,10 @@
 ---
 - name: Install Operators on Kubernetes Cluster
   hosts: localhost
-  collections:
-   - community.kubernetes
   tasks:
 
   - name: Create a Subscription for Service Binding Operator
-    k8s:
+    kubernetes.core.k8s:
       state: present
       definition:
         apiVersion: operators.coreos.com/v1alpha1
@@ -20,7 +18,7 @@
           source: redhat-operators
           sourceNamespace: openshift-marketplace
   - name: Create a Subscription for EDB Postgresql Operator
-    k8s:
+    kubernetes.core.k8s:
       state: present
       definition:
         apiVersion: operators.coreos.com/v1alpha1

diff --git a/scripts/ansible/Cluster/windows-openshift-cluster/requirements.yml b/scripts/ansible/Cluster/windows-openshift-cluster/requirements.yml
@@ -1,5 +1,5 @@
 ---
 collections:
 - ibm.cloudcollection
-- name: community.kubernetes
+- name: kubernetes.core
   version: 2.0.0