Run helm through bastion

paulscherrerinstitute · Dec 7, 2023 · 6e812a2 · 6e812a2
1 parent af43614
commit 6e812a2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 48 deletions.
diff --git a/.github/actions/open-ssh-tunnel/action.yml b/.github/actions/open-ssh-tunnel/action.yml
@@ -22,5 +22,4 @@ runs:
         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;
-        ps -ax | grep ssh | grep -v grep | awk '{print $1}' | xargs kill;
       shell: bash
diff --git a/.github/workflows/reusable.build-deploy.yml b/.github/workflows/reusable.build-deploy.yml
@@ -161,6 +161,3 @@ jobs:
         secrets: '${{ secrets.JSON_SECRETS }}'
       env:
         KUBECONFIG_FILE: '${{ secrets.KUBECONFIG }}'
-
-    - name: Close ssh connection
-      run:       
diff --git a/.github/workflows/scicat-search-api.yml b/.github/workflows/scicat-search-api.yml
@@ -10,7 +10,7 @@ on:
         description: 'Commit of the CI repo to deploy'     
         required: false
   pull_request:
-    branches: [ main]
+    branches: [ main ]
   push:
     branches: [ main ]
   release:
@@ -20,54 +20,45 @@ jobs:
 
   ssh:
 
-    runs-on: ubuntu-latest
-    environment: development
-    steps: 
-      - 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 }}'
-
   set_env: 
     needs: ssh
     uses: ./.github/workflows/reusable.environment.yml
     with: 
       commit: ${{ github.event.inputs.commit }}
       submodule_commit: ${{ github.event.inputs.submodule_commit }}
 
-  # check_changed:
-  #   needs: set_env
-  #   uses: ./.github/workflows/reusable.changes.yml
-  #   with: 
-  #     files: | 
-  #       .github/workflows/scicat-search-api.yml
-  #       helm/configs/search-api/${{ needs.set_env.outputs.environment }}/**
-  #       helm/configs/search-api/values.yaml
-  #       search-api/**
-  #     commit: ${{ needs.set_env.outputs.commit }}
-  #     submodule_commit: ${{ github.event.inputs.submodule_commit }}
-  #     submodule: search-api
+  check_changed:
+    needs: set_env
+    uses: ./.github/workflows/reusable.changes.yml
+    with: 
+      files: | 
+        .github/workflows/scicat-search-api.yml
+        helm/configs/search-api/${{ needs.set_env.outputs.environment }}/**
+        helm/configs/search-api/values.yaml
+        search-api/**
+      commit: ${{ needs.set_env.outputs.commit }}
+      submodule_commit: ${{ github.event.inputs.submodule_commit }}
+      submodule: search-api
 
-  # build_deploy_scicat_search_api:
-  #   if: (needs.check_changed.outputs.changed == 'true' && !needs.set_env.outputs.component) || needs.set_env.outputs.component == 'sa'
-  #   needs: 
-  #    - check_changed
-  #    - set_env
-  #   uses: ./.github/workflows/reusable.build-deploy.yml
-  #   with: 
-  #     context: search-api/.
-  #     image_name: ${{ github.repository }}/search-api
-  #     release_name: search-api
-  #     tag: ${{ needs.set_env.outputs.tag }}
-  #     environment: ${{ needs.set_env.outputs.environment }}
-  #     commit: ${{ needs.set_env.outputs.commit }}
-  #     submodule_commit: ${{ github.event.inputs.submodule_commit }}
-  #     submodule: search-api
-  #     helm_set_files: >-
-  #       CONFIG=helm/configs/search-api/config.json
-  #       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 }}
+  build_deploy_scicat_search_api:
+    if: (needs.check_changed.outputs.changed == 'true' && !needs.set_env.outputs.component) || needs.set_env.outputs.component == 'sa'
+    needs: 
+     - check_changed
+     - set_env
+    uses: ./.github/workflows/reusable.build-deploy.yml
+    with: 
+      context: search-api/.
+      image_name: ${{ github.repository }}/search-api
+      release_name: search-api
+      tag: ${{ needs.set_env.outputs.tag }}
+      environment: ${{ needs.set_env.outputs.environment }}
+      commit: ${{ needs.set_env.outputs.commit }}
+      submodule_commit: ${{ github.event.inputs.submodule_commit }}
+      submodule: search-api
+      helm_set_files: >-
+        CONFIG=helm/configs/search-api/config.json
+        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 }}