From ab7712acd6fdabc1c8d65df3bfc95129a46320e7 Mon Sep 17 00:00:00 2001
From: Carlo Minotti <50220438+minottic@users.noreply.github.com>
Date: Thu, 7 Dec 2023 15:12:33 +0100
Subject: [PATCH] Revert "Set bastion ssh"

This reverts commit 71570665f94a2a5ed5c828ac2dd070137a318724.
---
 .github/actions/open-ssh-tunnel/action.yml  | 25 ---------------------
 .github/workflows/reusable.build-deploy.yml | 12 ----------
 .github/workflows/scicat-search-api.yml     |  2 --
 3 files changed, 39 deletions(-)
 delete mode 100644 .github/actions/open-ssh-tunnel/action.yml

diff --git a/.github/actions/open-ssh-tunnel/action.yml b/.github/actions/open-ssh-tunnel/action.yml
deleted file mode 100644
index 36567cbd..00000000
--- a/.github/actions/open-ssh-tunnel/action.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: deploy-helm
-description: "Helm deploy"
-
-inputs:
-  bastion_user: 
-    description: username@host for the ssh tunnel
-    required: true
-    type: string
-  bastion_ssh_key: 
-    description: private ssh key content
-    required: true
-    type: string
-
-runs:
-  using: "composite"
-  steps:
-    - run: |
-        mkdir .ssh;
-        BASTION_USER=${{ inputs.bastion_user}};
-        echo ${{ inputs.bastion_ssh_key }} | base64 -d > .ssh/github_bastion;
-        chmod 600 .ssh/github_bastion;
-        ssh-keyscan ${BASTION_USER#*@} > .ssh/known_hosts 2> /dev/null;
-        chmod 644 .ssh/known_hosts;
-        ssh -i .ssh/github_bastion ${{ inputs.bastion_user }} -o UserKnownHostsFile=.ssh/known_hosts -D 1080 -f -q -N;
-      shell: bash
diff --git a/.github/workflows/reusable.build-deploy.yml b/.github/workflows/reusable.build-deploy.yml
index dfd8b697..1164dd55 100644
--- a/.github/workflows/reusable.build-deploy.yml
+++ b/.github/workflows/reusable.build-deploy.yml
@@ -63,12 +63,6 @@ on:
       SSH_PRIVATE_KEY: 
         description: ssh key to private submodule
         required: false
-      BASTION_USER: 
-        description: ssh bastion user@server
-        required: true
-      BASTION_SSH_KEY: 
-        description: bastion ssh key
-        required: true
       
 jobs:
 
@@ -137,12 +131,6 @@ jobs:
       with:
         ref: ${{ inputs.commit }}
 
-    - name: Open ssh tunnel
-      uses: paulscherrerinstitute/scicat-ci/.github/actions/open-ssh-tunnel@bastion_ssh
-      with: 
-        bastion_user: '${{ secrets.BASTION_USER }}'
-        bastion_ssh_key: '${{ secrets.BASTION_SSH_KEY }}'
-
     - name: Deploy to k8s using helm
       id: helm-deploy
       uses: paulscherrerinstitute/scicat-ci/.github/actions/deploy-helm@main
diff --git a/.github/workflows/scicat-search-api.yml b/.github/workflows/scicat-search-api.yml
index 64a414b7..67e0cc89 100644
--- a/.github/workflows/scicat-search-api.yml
+++ b/.github/workflows/scicat-search-api.yml
@@ -57,5 +57,3 @@ jobs:
         COMPONENT_CONFIG=helm/configs/search-api/component-config.json
     secrets:
       KUBECONFIG: ${{ secrets.KUBECONFIG }}
-      BASTION_USER: ${{ secrets.BASTION_USER }}
-      BASTION_SSH_KEY: ${{ secrets.BASTION_SSH_KEY }}