From 788cfd9bd98a2275132df850b8552aad8842e897 Mon Sep 17 00:00:00 2001 From: katexochen <49727155+katexochen@users.noreply.github.com> Date: Tue, 20 Sep 2022 10:38:38 +0200 Subject: [PATCH] Remove autoscaling from workflows --- .github/actions/constellation_create/action.yml | 6 +----- .github/actions/e2e_test/action.yml | 4 ---- .github/actions/generate_measurements/action.yml | 5 ----- .github/docs/README.md | 3 +-- .github/docs/release.md | 8 ++++---- .github/workflows/e2e-test-azure-weekly.yml | 1 - .github/workflows/e2e-test-azure.yml | 2 -- .github/workflows/e2e-test-gcp-weekly.yml | 1 - .github/workflows/e2e-test-gcp.yml | 2 -- .github/workflows/e2e-test-manual-macos.yml | 6 ------ .github/workflows/e2e-test-manual.yml | 6 ------ 11 files changed, 6 insertions(+), 38 deletions(-) diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml index a1cb05bc0..db622f4fd 100644 --- a/.github/actions/constellation_create/action.yml +++ b/.github/actions/constellation_create/action.yml @@ -8,9 +8,6 @@ inputs: controlNodesCount: description: "Number of control-plane nodes to spawn." required: true - autoscale: - description: "Enable / Disable autoscaling." - required: true cloudProvider: description: "Either 'gcp' or 'azure'." required: true @@ -150,8 +147,7 @@ runs: - name: Constellation init id: constellation-init run: | - if [ ${{ inputs.autoscale }} = true ]; then autoscale=--autoscale; fi - constellation init ${autoscale} + constellation init echo "::set-output name=KUBECONFIG::$(pwd)/constellation-admin.conf" shell: bash diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml index def1c8ccc..3571159bb 100644 --- a/.github/actions/e2e_test/action.yml +++ b/.github/actions/e2e_test/action.yml @@ -7,9 +7,6 @@ inputs: controlNodesCount: description: "Number of control-plane nodes to spawn." required: true - autoscale: - description: "Autoscale?" - required: true cloudProvider: description: "Which cloud provider to use." required: true @@ -93,7 +90,6 @@ runs: with: cloudProvider: ${{ inputs.cloudProvider }} gcpClusterServiceAccountKey: ${{ inputs.gcpClusterServiceAccountKey }} - autoscale: ${{ inputs.autoscale }} workerNodesCount: ${{ inputs.workerNodesCount }} controlNodesCount: ${{ inputs.controlNodesCount }} machineType: ${{ inputs.machineType }} diff --git a/.github/actions/generate_measurements/action.yml b/.github/actions/generate_measurements/action.yml index 1df6e8597..dd8d62d18 100644 --- a/.github/actions/generate_measurements/action.yml +++ b/.github/actions/generate_measurements/action.yml @@ -25,10 +25,6 @@ inputs: description: "Kubernetes version to create the cluster from." required: false default: "1.23" - autoscale: - description: "Autoscale?" - required: false - default: "false" gcp_service_account_json: description: "Service account with permissions to create Constellation on GCP." required: false @@ -88,7 +84,6 @@ runs: with: cloudProvider: ${{ inputs.cloudProvider }} gcpClusterServiceAccountKey: ${{ inputs.gcpClusterServiceAccountKey }} - autoscale: ${{ inputs.autoscale }} workerNodesCount: ${{ inputs.workerNodesCount }} controlNodesCount: ${{ inputs.controlNodesCount }} machineType: ${{ inputs.machineType }} diff --git a/.github/docs/README.md b/.github/docs/README.md index 023d4c655..d128fc74e 100644 --- a/.github/docs/README.md +++ b/.github/docs/README.md @@ -7,7 +7,7 @@ It is currently not possible to run a `workflow_dispatch` based workflow on a sp ```bash gh workflow run e2e-test-manual.yml \ --ref feat/e2e_pipeline \ # On your specific branch! - -F autoscale=false -F cloudProvider=gcp \ # With your ... + -F cloudProvider=gcp \ # With your ... -F controlNodesCount=1 -F workerNodesCount=2 \ # ... settings -F machineType=n2d-standard-4 ``` @@ -50,7 +50,6 @@ Create a new JSON file to describe the event ([relevant issue](https://github.co "inputs": { "workerNodesCount": "2", "controlNodesCount": "1", - "autoscale": false, "cloudProvider": "gcp", "machineType": "n2d-standard-4", "sonobuoyTestSuiteCmd": "--mode quick" diff --git a/.github/docs/release.md b/.github/docs/release.md index 7c65a6e3a..07cfe4acc 100644 --- a/.github/docs/release.md +++ b/.github/docs/release.md @@ -43,10 +43,10 @@ This checklist will prepare `v1.3.0` from `v1.2.0`. Adjust your version numbers 8. Update [default images in config](/internal/config/images_enterprise.go) 9. Run manual E2E tests using [Linux](/.github/workflows/e2e-test-manual.yml) and [macOS](/.github/workflows/e2e-test-manual-macos.yml) to confirm functionality and stability. ```sh - gh workflow run e2e-test-manual.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F autoscale=false -F cloudProvider=azure -F machineType=Standard_DC4as_v5 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=/CommunityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/Images/constellation/Versions/1.3.0 -F isDebugImage=false - gh workflow run e2e-test-manual-macos.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F autoscale=false -F cloudProvider=azure -F machineType=Standard_DC4as_v5 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=/CommunityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/Images/constellation/Versions/1.3.0 -F isDebugImage=false - gh workflow run e2e-test-manual.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F autoscale=false -F cloudProvider=gcp -F machineType=n2d-standard-4 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=projects/constellation-images/global/images/constellation-v1-3-0 -F isDebugImage=false - gh workflow run e2e-test-manual-macos.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F autoscale=false -F cloudProvider=gcp -F machineType=n2d-standard-4 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=projects/constellation-images/global/images/constellation-v1-3-0 -F isDebugImage=false + gh workflow run e2e-test-manual.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F cloudProvider=azure -F machineType=Standard_DC4as_v5 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=/CommunityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/Images/constellation/Versions/1.3.0 -F isDebugImage=false + gh workflow run e2e-test-manual-macos.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F cloudProvider=azure -F machineType=Standard_DC4as_v5 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=/CommunityGalleries/ConstellationCVM-b3782fa0-0df7-4f2f-963e-fc7fc42663df/Images/constellation/Versions/1.3.0 -F isDebugImage=false + gh workflow run e2e-test-manual.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F cloudProvider=gcp -F machineType=n2d-standard-4 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=projects/constellation-images/global/images/constellation-v1-3-0 -F isDebugImage=false + gh workflow run e2e-test-manual-macos.yml --ref release/v1.3 -F workerNodesCount=2 -F controlNodesCount=1 -F cloudProvider=gcp -F machineType=n2d-standard-4 -F sonobuoyTestSuiteCmd="--mode quick" -F kubernetesVersion=1.23 -F coreosImage=projects/constellation-images/global/images/constellation-v1-3-0 -F isDebugImage=false ``` 10. [Generate measurements](/.github/workflows/generate-measurements.yml) for the images on each CSP. ```sh diff --git a/.github/workflows/e2e-test-azure-weekly.yml b/.github/workflows/e2e-test-azure-weekly.yml index dac2f6c11..74a80f5d1 100644 --- a/.github/workflows/e2e-test-azure-weekly.yml +++ b/.github/workflows/e2e-test-azure-weekly.yml @@ -42,7 +42,6 @@ jobs: with: workerNodesCount: "2" controlNodesCount: "1" - autoscale: "false" cloudProvider: "azure" sonobuoyTestSuiteCmd: '--plugin e2e --plugin-env e2e.E2E_FOCUS="\[Conformance\]" --plugin-env e2e.E2E_SKIP="for service with type clusterIP|HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol" --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-plugin.yaml --plugin https://raw.githubusercontent.com/vmware-tanzu/sonobuoy-plugins/master/cis-benchmarks/kube-bench-master-plugin.yaml' kubernetesVersion: ${{ matrix.version }} diff --git a/.github/workflows/e2e-test-azure.yml b/.github/workflows/e2e-test-azure.yml index 2f0e39566..0acd78e52 100644 --- a/.github/workflows/e2e-test-azure.yml +++ b/.github/workflows/e2e-test-azure.yml @@ -37,7 +37,6 @@ jobs: with: workerNodesCount: "2" controlNodesCount: "1" - autoscale: "false" cloudProvider: "azure" azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }} azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }} @@ -110,7 +109,6 @@ jobs: with: workerNodesCount: "2" controlNodesCount: "1" - autoscale: "false" cloudProvider: "azure" azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }} azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }} diff --git a/.github/workflows/e2e-test-gcp-weekly.yml b/.github/workflows/e2e-test-gcp-weekly.yml index f45054b74..2e20dea7e 100644 --- a/.github/workflows/e2e-test-gcp-weekly.yml +++ b/.github/workflows/e2e-test-gcp-weekly.yml @@ -28,7 +28,6 @@ jobs: with: workerNodesCount: "2" controlNodesCount: "1" - autoscale: "false" cloudProvider: "gcp" gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }} diff --git a/.github/workflows/e2e-test-gcp.yml b/.github/workflows/e2e-test-gcp.yml index 0bd624e8f..c5aa4405c 100644 --- a/.github/workflows/e2e-test-gcp.yml +++ b/.github/workflows/e2e-test-gcp.yml @@ -23,7 +23,6 @@ jobs: with: workerNodesCount: "2" controlNodesCount: "1" - autoscale: "false" cloudProvider: "gcp" gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }} @@ -71,7 +70,6 @@ jobs: with: workerNodesCount: "2" controlNodesCount: "1" - autoscale: "false" cloudProvider: "gcp" machineType: "n2d-standard-4" gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} diff --git a/.github/workflows/e2e-test-manual-macos.yml b/.github/workflows/e2e-test-manual-macos.yml index c666da4e3..1b7b31adf 100644 --- a/.github/workflows/e2e-test-manual-macos.yml +++ b/.github/workflows/e2e-test-manual-macos.yml @@ -11,11 +11,6 @@ on: description: "Number of control-plane nodes to spawn." default: "1" required: true - autoscale: - description: "Autoscale?" - type: boolean - default: false - required: true cloudProvider: description: "Which cloud provider to use." type: choice @@ -114,7 +109,6 @@ jobs: with: workerNodesCount: ${{ github.event.inputs.workerNodesCount }} controlNodesCount: ${{ github.event.inputs.controlNodesCount }} - autoscale: ${{ github.event.inputs.autoscale }} cloudProvider: ${{ github.event.inputs.cloudProvider }} machineType: ${{ github.event.inputs.machineType }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} diff --git a/.github/workflows/e2e-test-manual.yml b/.github/workflows/e2e-test-manual.yml index d3ebc9082..75ea6feed 100644 --- a/.github/workflows/e2e-test-manual.yml +++ b/.github/workflows/e2e-test-manual.yml @@ -11,11 +11,6 @@ on: description: "Number of control-plane nodes to spawn." default: "1" required: true - autoscale: - description: "Autoscale?" - type: boolean - default: false - required: true cloudProvider: description: "Which cloud provider to use." type: choice @@ -80,7 +75,6 @@ jobs: with: workerNodesCount: ${{ github.event.inputs.workerNodesCount }} controlNodesCount: ${{ github.event.inputs.controlNodesCount }} - autoscale: ${{ github.event.inputs.autoscale }} cloudProvider: ${{ github.event.inputs.cloudProvider }} machineType: ${{ github.event.inputs.machineType }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}