Skip to content

Commit fe50d37

Browse files
committed
CI test
1 parent 26cc66e commit fe50d37

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,12 @@ jobs:
116116

117117
- name: Initialise Terraform
118118
id: init
119+
env:
120+
AZURE_APP_SUBSCRIPTION_ID: ${{ secrets.AZURE_APP_SUBSCRIPTION_ID }}
119121
run: |
120122
echo "" >> build/terraform.tfvars.azure
121-
rm -rf terraform-ci/.terraform/modules
122-
rm -rf terraform-module/.terraform/modules
123123
echo "jfrog_credential_provider_binary_url=\"$JFROG_CREDENTIAL_PLUGIN_BINARY_URL\"" >> build/terraform.tfvars.azure
124+
echo "azure_subscription_id=\"$AZURE_APP_SUBSCRIPTION_ID\"" >> build/terraform.tfvars.azure
124125
cp build/terraform.tfvars.azure terraform-ci/terraform.tfvars
125126
cd terraform-ci
126127
terraform init

build/terraform.tfvars.azure

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,13 @@ enable_aws = false
2828

2929
enable_azure = true
3030

31-
azure_subscription_id = "6a2a0854-0ddb-4c9d-ac3e-5348c205002c"
32-
3331
azure_resource_group_name = "infra-robin-test"
3432

3533
azure_location = "eastus"
3634

3735
create_aks_cluster = true
3836

39-
aks_cluster_name = "infra-robin-test-aks"
37+
aks_cluster_name = "jfrog-test-aks"
4038

4139
azure_node_count = 3
4240
azure_node_vm_size = "Standard_D2pds_v5"

terraform-ci/eks_nodegroup.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ module "daemonset_test_ng" {
111111

112112
module "ebs_csi_irsa_role" {
113113
count = var.enable_aws && var.create_eks_cluster ? 1 : 0
114-
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
114+
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
115115

116-
role_name = "ebs-csi-role-${local.cluster_name}-${var.region}"
116+
name = "ebs-csi-role-${local.cluster_name}-${var.region}"
117117
attach_ebs_csi_policy = true
118118

119119
oidc_providers = {

0 commit comments

Comments
 (0)