Updating to include platform options

Author: angelos-p

.github/workflows/kubecover-actions-flow.yaml

@@ -11,7 +11,10 @@ on:
         required: true
         type: string
         default: "stable"
-      k8s_version:
+      platform_version:
+        required: true
+        type: string
+      platform:
         required: true
         type: string
       operator_version:
@@ -74,6 +77,10 @@ on:
         required: true
       CR_PAT:
         required: true
+      OPENSHIFT_IAM_USER_ACCESS_ID:
+        required: true
+      OPENSHIFT_IAM_USER_SECRET_KEY:
+        required: true
 
 jobs:
   build_image:
@@ -95,7 +102,8 @@ jobs:
       - name: Echo Inputs
         run: |
           echo Platform Builder version: ${{ inputs.platform_builder_version }}
-          echo Kubernetes version: ${{ inputs.k8s_version }}
+          echo Platform version: ${{ inputs.platform_version }}
+          echo Platfrom: ${{ inputs.platform }}
           echo Ondat version: ${{ inputs.operator_version }}
           echo Tests Regex: ${{ inputs.tests_regex }}
           echo Use existing cluster: ${{ inputs.use_existing_cluster }}
@@ -125,9 +133,13 @@ jobs:
 
       - name: Get Cluster
         id: get_cluster
-        uses: ./.github/actions/github-actions/get_k8s_cluster
+        uses: ./.github/actions/github-actions/get_cluster
+        env:
+          OCP_AWS_ACCESS_KEY_ID: ${{ secrets.OPENSHIFT_IAM_USER_ACCESS_ID }}
+          OCP_AWS_SECRET_ACCESS_KEY: ${{ secrets.OPENSHIFT_IAM_USER_SECRET_KEY }}
         with:
-          k8s_version: ${{ inputs.k8s_version }}
+          platform: ${{ inputs.platform }}
+          platform_version: ${{ inputs.platform_version }}
           use_existing_cluster: ${{ inputs.use_existing_cluster }}
           workers_num: ${{ inputs.workers_num }}
           disk_size: ${{ inputs.disk_size }}
@@ -165,6 +177,7 @@ jobs:
           nfs_container: ${{ inputs.nfs_container }}
           node_container: ${{ inputs.node_container }}
           operator_version: ${{ inputs.operator_version }}
+          platform: ${{ inputs.platform }}
 
   run-tests:
     needs: [install_ondat]
@@ -196,7 +209,6 @@ jobs:
       image: 120921464587.dkr.ecr.eu-west-2.amazonaws.com/platform-builder:${{ inputs.platform_builder_version }}
     runs-on: self-hosted
     steps:
-
       - name: Checkout GitHub Action Repo
         uses: actions/checkout@v2
         with:
@@ -205,6 +217,23 @@ jobs:
           repository: ondat/github_actions
           token: ${{ secrets.ONDAT_ORG_TOKEN }}
 
+      - uses: actions/download-artifact@v2
+        with:
+        name: cluster_name
+
+      - name: Set cluster name var from artefact
+        id: vars
+        shell: bash
+        run: |
+          echo "CLUSTER_NAME=$(cat cluster_name)" >> $GITHUB_ENV
+          export CLUSTER_NAME=$(cat cluster_name)
+
       - name: Destroy Cluster
         id: destroy_cluster
-        uses: ./.github/actions/github-actions/destroy_k8s_cluster
+        uses: ./.github/actions/github-actions/destroy_cluster
+        env:
+          OCP_AWS_ACCESS_KEY_ID: ${{ secrets.OPENSHIFT_IAM_USER_ACCESS_ID }}
+          OCP_AWS_SECRET_ACCESS_KEY: ${{ secrets.OPENSHIFT_IAM_USER_SECRET_KEY }}
+        name:
+          platform: ${{ inputs.platform }}
+          cluster_name: ${{ env.cluster_name }}

.github/workflows/run-kubecover-api-manager.yaml

@@ -8,7 +8,8 @@ jobs:
     with:
       platform_builder_version: "stable"
       kubecover_version: "latest"
-      k8s_version: '1.22'
+      platform: 'k8s'
+      platform_version: '1.22'
       operator_version: 'v2.6.0'
       node_container: 'storageos/node:v2.6.0'
       init_container: 'storageos/init:v2.1.1'
@@ -21,3 +22,5 @@ jobs:
       ONDAT_ORG_TOKEN: ${{ secrets.ONDAT_ORG_TOKEN }}
       CR_USER: ${{ secrets.CR_USER }}
       CR_PAT: ${{ secrets.CR_PAT }}
+      OCP_AWS_ACCESS_KEY_ID: ${{ secrets.OPENSHIFT_IAM_USER_ACCESS_ID }}
+      OCP_AWS_SECRET_ACCESS_KEY: ${{ secrets.OPENSHIFT_IAM_USER_SECRET_KEY }}