Remove autoscaling from workflows

This commit is contained in:
katexochen 2022-09-20 10:38:38 +02:00 committed by Paul Meyer
parent bcab213139
commit 788cfd9bd9
11 changed files with 6 additions and 38 deletions

View File

@ -8,9 +8,6 @@ inputs:
controlNodesCount: controlNodesCount:
description: "Number of control-plane nodes to spawn." description: "Number of control-plane nodes to spawn."
required: true required: true
autoscale:
description: "Enable / Disable autoscaling."
required: true
cloudProvider: cloudProvider:
description: "Either 'gcp' or 'azure'." description: "Either 'gcp' or 'azure'."
required: true required: true
@ -150,8 +147,7 @@ runs:
- name: Constellation init - name: Constellation init
id: constellation-init id: constellation-init
run: | run: |
if [ ${{ inputs.autoscale }} = true ]; then autoscale=--autoscale; fi constellation init
constellation init ${autoscale}
echo "::set-output name=KUBECONFIG::$(pwd)/constellation-admin.conf" echo "::set-output name=KUBECONFIG::$(pwd)/constellation-admin.conf"
shell: bash shell: bash

View File

@ -7,9 +7,6 @@ inputs:
controlNodesCount: controlNodesCount:
description: "Number of control-plane nodes to spawn." description: "Number of control-plane nodes to spawn."
required: true required: true
autoscale:
description: "Autoscale?"
required: true
cloudProvider: cloudProvider:
description: "Which cloud provider to use." description: "Which cloud provider to use."
required: true required: true
@ -93,7 +90,6 @@ runs:
with: with:
cloudProvider: ${{ inputs.cloudProvider }} cloudProvider: ${{ inputs.cloudProvider }}
gcpClusterServiceAccountKey: ${{ inputs.gcpClusterServiceAccountKey }} gcpClusterServiceAccountKey: ${{ inputs.gcpClusterServiceAccountKey }}
autoscale: ${{ inputs.autoscale }}
workerNodesCount: ${{ inputs.workerNodesCount }} workerNodesCount: ${{ inputs.workerNodesCount }}
controlNodesCount: ${{ inputs.controlNodesCount }} controlNodesCount: ${{ inputs.controlNodesCount }}
machineType: ${{ inputs.machineType }} machineType: ${{ inputs.machineType }}

View File

@ -25,10 +25,6 @@ inputs:
description: "Kubernetes version to create the cluster from." description: "Kubernetes version to create the cluster from."
required: false required: false
default: "1.23" default: "1.23"
autoscale:
description: "Autoscale?"
required: false
default: "false"
gcp_service_account_json: gcp_service_account_json:
description: "Service account with permissions to create Constellation on GCP." description: "Service account with permissions to create Constellation on GCP."
required: false required: false
@ -88,7 +84,6 @@ runs:
with: with:
cloudProvider: ${{ inputs.cloudProvider }} cloudProvider: ${{ inputs.cloudProvider }}
gcpClusterServiceAccountKey: ${{ inputs.gcpClusterServiceAccountKey }} gcpClusterServiceAccountKey: ${{ inputs.gcpClusterServiceAccountKey }}
autoscale: ${{ inputs.autoscale }}
workerNodesCount: ${{ inputs.workerNodesCount }} workerNodesCount: ${{ inputs.workerNodesCount }}
controlNodesCount: ${{ inputs.controlNodesCount }} controlNodesCount: ${{ inputs.controlNodesCount }}
machineType: ${{ inputs.machineType }} machineType: ${{ inputs.machineType }}

View File

@ -7,7 +7,7 @@ It is currently not possible to run a `workflow_dispatch` based workflow on a sp
```bash ```bash
gh workflow run e2e-test-manual.yml \ gh workflow run e2e-test-manual.yml \
--ref feat/e2e_pipeline \ # On your specific branch! --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 controlNodesCount=1 -F workerNodesCount=2 \ # ... settings
-F machineType=n2d-standard-4 -F machineType=n2d-standard-4
``` ```
@ -50,7 +50,6 @@ Create a new JSON file to describe the event ([relevant issue](https://github.co
"inputs": { "inputs": {
"workerNodesCount": "2", "workerNodesCount": "2",
"controlNodesCount": "1", "controlNodesCount": "1",
"autoscale": false,
"cloudProvider": "gcp", "cloudProvider": "gcp",
"machineType": "n2d-standard-4", "machineType": "n2d-standard-4",
"sonobuoyTestSuiteCmd": "--mode quick" "sonobuoyTestSuiteCmd": "--mode quick"

View File

@ -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) 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. 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 ```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.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 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 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.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 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 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. 10. [Generate measurements](/.github/workflows/generate-measurements.yml) for the images on each CSP.
```sh ```sh

View File

@ -42,7 +42,6 @@ jobs:
with: with:
workerNodesCount: "2" workerNodesCount: "2"
controlNodesCount: "1" controlNodesCount: "1"
autoscale: "false"
cloudProvider: "azure" 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' 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 }} kubernetesVersion: ${{ matrix.version }}

View File

@ -37,7 +37,6 @@ jobs:
with: with:
workerNodesCount: "2" workerNodesCount: "2"
controlNodesCount: "1" controlNodesCount: "1"
autoscale: "false"
cloudProvider: "azure" cloudProvider: "azure"
azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }} azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }}
azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }} azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }}
@ -110,7 +109,6 @@ jobs:
with: with:
workerNodesCount: "2" workerNodesCount: "2"
controlNodesCount: "1" controlNodesCount: "1"
autoscale: "false"
cloudProvider: "azure" cloudProvider: "azure"
azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }} azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }}
azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }} azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }}

View File

@ -28,7 +28,6 @@ jobs:
with: with:
workerNodesCount: "2" workerNodesCount: "2"
controlNodesCount: "1" controlNodesCount: "1"
autoscale: "false"
cloudProvider: "gcp" cloudProvider: "gcp"
gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }} gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }}

View File

@ -23,7 +23,6 @@ jobs:
with: with:
workerNodesCount: "2" workerNodesCount: "2"
controlNodesCount: "1" controlNodesCount: "1"
autoscale: "false"
cloudProvider: "gcp" cloudProvider: "gcp"
gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }} gcpClusterServiceAccountKey: ${{ secrets.GCP_CLUSTER_SERVICE_ACCOUNT }}
@ -71,7 +70,6 @@ jobs:
with: with:
workerNodesCount: "2" workerNodesCount: "2"
controlNodesCount: "1" controlNodesCount: "1"
autoscale: "false"
cloudProvider: "gcp" cloudProvider: "gcp"
machineType: "n2d-standard-4" machineType: "n2d-standard-4"
gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}

View File

@ -11,11 +11,6 @@ on:
description: "Number of control-plane nodes to spawn." description: "Number of control-plane nodes to spawn."
default: "1" default: "1"
required: true required: true
autoscale:
description: "Autoscale?"
type: boolean
default: false
required: true
cloudProvider: cloudProvider:
description: "Which cloud provider to use." description: "Which cloud provider to use."
type: choice type: choice
@ -114,7 +109,6 @@ jobs:
with: with:
workerNodesCount: ${{ github.event.inputs.workerNodesCount }} workerNodesCount: ${{ github.event.inputs.workerNodesCount }}
controlNodesCount: ${{ github.event.inputs.controlNodesCount }} controlNodesCount: ${{ github.event.inputs.controlNodesCount }}
autoscale: ${{ github.event.inputs.autoscale }}
cloudProvider: ${{ github.event.inputs.cloudProvider }} cloudProvider: ${{ github.event.inputs.cloudProvider }}
machineType: ${{ github.event.inputs.machineType }} machineType: ${{ github.event.inputs.machineType }}
gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}

View File

@ -11,11 +11,6 @@ on:
description: "Number of control-plane nodes to spawn." description: "Number of control-plane nodes to spawn."
default: "1" default: "1"
required: true required: true
autoscale:
description: "Autoscale?"
type: boolean
default: false
required: true
cloudProvider: cloudProvider:
description: "Which cloud provider to use." description: "Which cloud provider to use."
type: choice type: choice
@ -80,7 +75,6 @@ jobs:
with: with:
workerNodesCount: ${{ github.event.inputs.workerNodesCount }} workerNodesCount: ${{ github.event.inputs.workerNodesCount }}
controlNodesCount: ${{ github.event.inputs.controlNodesCount }} controlNodesCount: ${{ github.event.inputs.controlNodesCount }}
autoscale: ${{ github.event.inputs.autoscale }}
cloudProvider: ${{ github.event.inputs.cloudProvider }} cloudProvider: ${{ github.event.inputs.cloudProvider }}
machineType: ${{ github.event.inputs.machineType }} machineType: ${{ github.event.inputs.machineType }}
gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }} gcp_service_account_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}