From 02106ddf71b6fd1de2eca7f7b9b444e11ff48e04 Mon Sep 17 00:00:00 2001 From: Alejandro de Brito Fontes Date: Sun, 16 Jul 2023 21:59:33 +0000 Subject: [PATCH] Cleanup --- .github/actions/delete-preview/action.yml | 5 ----- .github/actions/deploy-gitpod/entrypoint.sh | 2 -- .github/actions/deploy-gitpod/metadata.yml | 3 --- .github/actions/deploy-monitoring-satellite/Dockerfile | 5 ----- .github/actions/deploy-monitoring-satellite/entrypoint.sh | 2 -- .github/actions/deploy-monitoring-satellite/metadata.yml | 4 +--- .github/actions/preview-create/Dockerfile | 5 ----- .github/actions/preview-create/entrypoint.sh | 2 -- .github/actions/preview-create/metadata.yml | 3 --- .github/workflows/build.yml | 4 +--- .github/workflows/ide-integration-tests.yml | 2 -- .github/workflows/preview-env-check-regressions.yml | 2 -- .github/workflows/preview-env-gc.yml | 2 -- .github/workflows/workspace-integration-tests.yml | 2 -- 14 files changed, 2 insertions(+), 41 deletions(-) diff --git a/.github/actions/delete-preview/action.yml b/.github/actions/delete-preview/action.yml index b90d28f69e2df0..18454923b781ad 100644 --- a/.github/actions/delete-preview/action.yml +++ b/.github/actions/delete-preview/action.yml @@ -7,9 +7,6 @@ inputs: name: description: "The name of the preview environment" required: true - previewctl_hash: - description: "The Leeway hash of the dev/preview/previewctl:docker package to be used when downloading previewclt" - required: false runs: using: "composite" @@ -20,8 +17,6 @@ runs: run: | gcloud auth activate-service-account --key-file "${PREVIEW_ENV_DEV_SA_KEY_PATH}" - leeway run dev/preview/previewctl:download - previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" export TF_INPUT=0 diff --git a/.github/actions/deploy-gitpod/entrypoint.sh b/.github/actions/deploy-gitpod/entrypoint.sh index a8d09e5bc340b7..a3d9be69436e3f 100755 --- a/.github/actions/deploy-gitpod/entrypoint.sh +++ b/.github/actions/deploy-gitpod/entrypoint.sh @@ -17,8 +17,6 @@ oci-tool fetch file -o /tmp/versions.yaml --platform=linux-amd64 "eu.gcr.io/gitp gcloud auth activate-service-account --key-file "${PREVIEW_ENV_DEV_SA_KEY_PATH}" -leeway run dev/preview/previewctl:download - echo "Setting up access to core-dev and harvester" previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" diff --git a/.github/actions/deploy-gitpod/metadata.yml b/.github/actions/deploy-gitpod/metadata.yml index ffdb4689061ae7..1acb75cc4b9535 100644 --- a/.github/actions/deploy-gitpod/metadata.yml +++ b/.github/actions/deploy-gitpod/metadata.yml @@ -10,9 +10,6 @@ inputs: version: description: "The version of Gitpod to install" required: true - previewctl_hash: - description: "The Leeway hash of the dev/preview/previewctl:docker package to be used when downloading previewclt" - required: false with_dedicated_emu: description: "Dedicated Config" required: false diff --git a/.github/actions/deploy-monitoring-satellite/Dockerfile b/.github/actions/deploy-monitoring-satellite/Dockerfile index e72333454dd68c..809f185ef2e1f7 100644 --- a/.github/actions/deploy-monitoring-satellite/Dockerfile +++ b/.github/actions/deploy-monitoring-satellite/Dockerfile @@ -1,9 +1,4 @@ FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-token-gha.13623 -USER root -ENV OCI_TOOL_VERSION="0.2.0" -RUN curl -fsSL https://github.com/csweichel/oci-tool/releases/download/v${OCI_TOOL_VERSION}/oci-tool_${OCI_TOOL_VERSION}_linux_amd64.tar.gz | tar xz -C /usr/local/bin && chmod +x /usr/local/bin/oci-tool -USER gitpod - COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/deploy-monitoring-satellite/entrypoint.sh b/.github/actions/deploy-monitoring-satellite/entrypoint.sh index b788e58cd0d2a1..8e1f807f02c2e7 100755 --- a/.github/actions/deploy-monitoring-satellite/entrypoint.sh +++ b/.github/actions/deploy-monitoring-satellite/entrypoint.sh @@ -9,8 +9,6 @@ mkdir "$HOME/bin" gcloud auth activate-service-account --key-file "${PREVIEW_ENV_DEV_SA_KEY_PATH}" -leeway run dev/preview/previewctl:download - echo "previewctl get-credentials" previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" diff --git a/.github/actions/deploy-monitoring-satellite/metadata.yml b/.github/actions/deploy-monitoring-satellite/metadata.yml index 8c835a6237c94f..aec8bb42659704 100644 --- a/.github/actions/deploy-monitoring-satellite/metadata.yml +++ b/.github/actions/deploy-monitoring-satellite/metadata.yml @@ -4,9 +4,7 @@ inputs: sa_key: description: "The service account key to use when authenticating with GCP" required: true - previewctl_hash: - description: "The Leeway hash of the dev/preview/previewctl:docker package to be used when downloading previewclt" - required: false + runs: using: "docker" image: "Dockerfile" diff --git a/.github/actions/preview-create/Dockerfile b/.github/actions/preview-create/Dockerfile index e72333454dd68c..809f185ef2e1f7 100644 --- a/.github/actions/preview-create/Dockerfile +++ b/.github/actions/preview-create/Dockerfile @@ -1,9 +1,4 @@ FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-token-gha.13623 -USER root -ENV OCI_TOOL_VERSION="0.2.0" -RUN curl -fsSL https://github.com/csweichel/oci-tool/releases/download/v${OCI_TOOL_VERSION}/oci-tool_${OCI_TOOL_VERSION}_linux_amd64.tar.gz | tar xz -C /usr/local/bin && chmod +x /usr/local/bin/oci-tool -USER gitpod - COPY entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/preview-create/entrypoint.sh b/.github/actions/preview-create/entrypoint.sh index 5ce68ca4c8c6d1..46f3c716d5d668 100755 --- a/.github/actions/preview-create/entrypoint.sh +++ b/.github/actions/preview-create/entrypoint.sh @@ -2,8 +2,6 @@ set -euo pipefail -leeway run dev/preview/previewctl:download - previewctl get-credentials --gcp-service-account "${INPUT_SA_KEY}" replace="module.preview_gce[0].google_compute_instance.default" diff --git a/.github/actions/preview-create/metadata.yml b/.github/actions/preview-create/metadata.yml index 6c195679a57689..bf4dbcf5496faf 100644 --- a/.github/actions/preview-create/metadata.yml +++ b/.github/actions/preview-create/metadata.yml @@ -11,9 +11,6 @@ inputs: description: "Whether to use a larger VM for the env" required: true default: false - previewctl_hash: - description: "The Leeway hash of the dev/preview/previewctl:docker package to be used when downloading previewclt" - required: false recreate_vm: description: "Whether to recreate the VM" required: false diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d9ca8c8cb16e07..12ff389645c1eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,7 +107,7 @@ jobs: infrastructure_provider: ${{ needs.configuration.outputs.preview_infra_provider }} large_vm: ${{ needs.configuration.outputs.with_large_vm }} recreate_vm: ${{ inputs.recreate_vm }} - sa_key: ${{ secrets.GCP_CREDENTIALS }} + sa_key: ${{ steps.auth.outputs.credentials_file_path }} leeway_segment_key: ${{ secrets.LEEWAY_SEGMENT_KEY }} build-gitpod: name: Build Gitpod @@ -397,8 +397,6 @@ jobs: TEST_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} TEST_BUILD_REF: ${{ github.head_ref || github.ref }} run: | - leeway run dev/preview/previewctl:install - echo "Setting up access to core-dev and harvester" previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" previewctl install-context --branch "${PREVIEW_NAME}" --log-level debug --timeout 1m --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" diff --git a/.github/workflows/ide-integration-tests.yml b/.github/workflows/ide-integration-tests.yml index f45f9221a590e7..3324afaaf79ed2 100644 --- a/.github/workflows/ide-integration-tests.yml +++ b/.github/workflows/ide-integration-tests.yml @@ -121,8 +121,6 @@ jobs: gcloud auth activate-service-account --key-file ${{ steps.auth.outputs.credentials_file_path }} - leeway run dev/preview/previewctl:install - echo "Setting up access to core-dev and harvester" previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" diff --git a/.github/workflows/preview-env-check-regressions.yml b/.github/workflows/preview-env-check-regressions.yml index 2948bcfeaba3ee..8e1059cf31bab6 100644 --- a/.github/workflows/preview-env-check-regressions.yml +++ b/.github/workflows/preview-env-check-regressions.yml @@ -104,8 +104,6 @@ jobs: gcloud auth activate-service-account --key-file ${{ steps.auth.outputs.credentials_file_path }} - leeway run dev/preview/previewctl:install - echo "Setting up access to core-dev and harvester" previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}" diff --git a/.github/workflows/preview-env-gc.yml b/.github/workflows/preview-env-gc.yml index 4f2d0dcf604707..2531a94b123bc2 100644 --- a/.github/workflows/preview-env-gc.yml +++ b/.github/workflows/preview-env-gc.yml @@ -33,8 +33,6 @@ jobs: gcloud auth activate-service-account --key-file ${{ steps.auth.outputs.credentials_file_path }} - leeway run dev/preview/previewctl:install - previewctl get-credentials --gcp-service-account ${{ steps.auth.outputs.credentials_file_path }} previewctl list stale | jq --null-input --raw-input --compact-output '[inputs | select(length>0)]' > /tmp/stale-json echo "names=$(cat /tmp/stale-json)" >> $GITHUB_OUTPUT diff --git a/.github/workflows/workspace-integration-tests.yml b/.github/workflows/workspace-integration-tests.yml index 5caba3ccea4c48..d262c4b5a46278 100644 --- a/.github/workflows/workspace-integration-tests.yml +++ b/.github/workflows/workspace-integration-tests.yml @@ -152,8 +152,6 @@ jobs: gcloud auth activate-service-account --key-file ${{ steps.auth.outputs.credentials_file_path }} - leeway run dev/preview/previewctl:install - echo "Setting up access to core-dev and harvester" previewctl get-credentials --gcp-service-account ${{ steps.auth.outputs.credentials_file_path }}