Skip to content

Commit f4ed7af

Browse files
authored
CI: remove the use of Github vars in workflows (hashicorp#2643)
1 parent b93158a commit f4ed7af

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

.github/workflows/acceptance_tests_aks.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ on:
2929

3030
env:
3131
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/aks/kubeconfig
32-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
33-
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS }}
34-
TF_VAR_location: ${{ github.event.inputs.location || vars.AZURE_LOCATION }}
35-
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || vars.AZURE_NODE_COUNT }}
36-
TF_VAR_vm_size: ${{ github.event.inputs.vmSize || vars.AZURE_VM_SIZE }}
37-
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || vars.CLUSTER_VERSION}}
32+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.10.1' }}
33+
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
34+
TF_VAR_location: ${{ github.event.inputs.location || 'canadaeast' }}
35+
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || '2' }}
36+
TF_VAR_vm_size: ${{ github.event.inputs.vmSize || 'Standard_A2_v2' }}
37+
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || '1.29' }}
3838

3939
jobs:
4040
acceptance_tests_aks:

.github/workflows/acceptance_tests_eks.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ on:
3131
- cron: '0 20 * * *'
3232

3333
env:
34-
AWS_REGION: ${{ github.event.inputs.region || vars.AWS_REGION }}
34+
AWS_REGION: ${{ github.event.inputs.region || 'ca-central-1' }}
3535
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/eks/kubeconfig
36-
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS }}
37-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
38-
TF_VAR_az_span: ${{ github.event.inputs.azSpan || vars.AWS_AZ_NUMBER }}
39-
TF_VAR_capacity_type: ${{ vars.AWS_CAPACITY_TYPE }}
40-
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || vars.CLUSTER_VERSION }}
41-
TF_VAR_nodes_per_az: ${{ github.event.inputs.nodesPerAz || vars.AWS_NODES_PER_AZ }}
42-
TF_VAR_instance_type: ${{ github.event.inputs.instanceType || vars.AWS_INSTANCE_TYPE }}
36+
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
37+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.10.1' }}
38+
TF_VAR_az_span: ${{ github.event.inputs.azSpan || '2' }}
39+
TF_VAR_capacity_type: ${{ 'SPOT' }}
40+
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || '1.29' }}
41+
TF_VAR_nodes_per_az: ${{ github.event.inputs.nodesPerAz || '1' }}
42+
TF_VAR_instance_type: ${{ github.event.inputs.instanceType || 'm7g.large' }}
4343

4444
jobs:
4545
acceptance_tests_eks:

.github/workflows/acceptance_tests_gke.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ on:
3232

3333
env:
3434
GOOGLE_PROJECT: ${{ secrets.GOOGLE_PROJECT }}
35-
GOOGLE_REGION: ${{ github.event.inputs.region || vars.GOOGLE_REGION }}
36-
GOOGLE_ZONE: ${{github.event.inputs.zone || vars.GOOGLE_ZONE }}
35+
GOOGLE_REGION: ${{ github.event.inputs.region || 'northamerica-northeast1' }}
36+
GOOGLE_ZONE: ${{github.event.inputs.zone || 'northamerica-northeast1-a' }}
3737
USE_GKE_GCLOUD_AUTH_PLUGIN: True
3838
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/gke/kubeconfig
39-
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS }}
40-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
41-
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || vars.CLUSTER_VERSION }}
42-
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || vars.GOOGLE_NODE_COUNT }}
43-
TF_VAR_instance_type: ${{ github.event.inputs.instanceType || vars.GOOGLE_INSTANCE_TYPE }}
39+
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
40+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.10.1' }}
41+
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || '1.29' }}
42+
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || '1' }}
43+
TF_VAR_instance_type: ${{ github.event.inputs.instanceType || 'e2-standard-2' }}
4444

4545
jobs:
4646
acceptance_tests_gke:

.github/workflows/acceptance_tests_kind.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ on:
2727

2828
env:
2929
KUBECONFIG: ${{ github.workspace }}/.kube/config
30-
KIND_VERSION: ${{ github.event.inputs.kindVersion || vars.KIND_VERSION || '0.25.0' }}
31-
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || vars.PARALLEL_RUNS || '8' }}
32-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || vars.TERRAFORM_VERSION || '1.10.1' }}
30+
KIND_VERSION: ${{ github.event.inputs.kindVersion || '0.25.0' }}
31+
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
32+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.10.1' }}
3333

3434
jobs:
3535
acceptance_tests_kind:

0 commit comments

Comments
 (0)