From f0b6d792d6c6810f91da4c039ce7d3eca97c5e89 Mon Sep 17 00:00:00 2001 From: vsm Date: Wed, 20 Nov 2024 10:37:39 +0530 Subject: [PATCH 01/22] Update iac-create-environment-pipeline-tf.yml --- environment_setup/iac-create-environment-pipeline-tf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-create-environment-pipeline-tf.yml b/environment_setup/iac-create-environment-pipeline-tf.yml index ef184546..b5776140 100644 --- a/environment_setup/iac-create-environment-pipeline-tf.yml +++ b/environment_setup/iac-create-environment-pipeline-tf.yml @@ -15,7 +15,7 @@ pr: - environment_setup/tf-templates/* pool: - vmImage: 'ubuntu-latest' + name: mlopspool variables: - group: devopsforai-aml-vg From 275174a8628609f8d15c16029a8b01cbe2edd4e2 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 11:15:59 +0530 Subject: [PATCH 02/22] added version --- .../iac-create-environment-pipeline-tf.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/environment_setup/iac-create-environment-pipeline-tf.yml b/environment_setup/iac-create-environment-pipeline-tf.yml index b5776140..77b67ae9 100644 --- a/environment_setup/iac-create-environment-pipeline-tf.yml +++ b/environment_setup/iac-create-environment-pipeline-tf.yml @@ -21,12 +21,12 @@ variables: - group: devopsforai-aml-vg steps: -- task: charleszipp.azure-pipelines-tasks-terraform.azure-pipelines-tasks-terraform-installer.TerraformInstaller@0 +- task: TerraformInstaller@1 displayName: 'Use Terraform 0.12.24' inputs: terraformVersion: 0.12.24 -- task: charleszipp.azure-pipelines-tasks-terraform.azure-pipelines-tasks-terraform-cli.TerraformCLI@0 +- task: TerraformCLI@0 displayName: 'TF init - Deploy MLOps resources to Azure' inputs: command: init @@ -42,13 +42,13 @@ steps: backendAzureRmContainerName: 'tfstate-cont' backendAzureRmKey: 'mlopsinfra.tfstate' -- task: charleszipp.azure-pipelines-tasks-terraform.azure-pipelines-tasks-terraform-cli.TerraformCLI@0 +- task: TerraformCLI@0 displayName: 'TF validate - Deploy MLOps resources to Azure' inputs: command: validate workingDirectory: '$(Build.SourcesDirectory)/environment_setup/tf-templates' -- task: charleszipp.azure-pipelines-tasks-terraform.azure-pipelines-tasks-terraform-cli.TerraformCLI@0 +- task: TerraformCLI@0 displayName: 'TF plan - Deploy MLOps resources to Azure' inputs: command: plan @@ -59,7 +59,7 @@ steps: TF_VAR_RESOURCE_GROUP: $(RESOURCE_GROUP) TF_VAR_WORKSPACE_NAME: $(WORKSPACE_NAME) -- task: charleszipp.azure-pipelines-tasks-terraform.azure-pipelines-tasks-terraform-cli.TerraformCLI@0 +- task: TerraformCLI@0 displayName: 'TF apply - Deploy MLOps resources to Azure' inputs: command: apply From b55b12c47048acca3d7895c4fefb007ba71af356 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 11:28:55 +0530 Subject: [PATCH 03/22] added --- environment_setup/tf-templates/main.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/environment_setup/tf-templates/main.tf b/environment_setup/tf-templates/main.tf index c57a5a84..3f19a7db 100644 --- a/environment_setup/tf-templates/main.tf +++ b/environment_setup/tf-templates/main.tf @@ -3,6 +3,11 @@ provider "azurerm" { features {} } +provider "azuredevops" { + org_service_url = "https://dev.azure.com/edforce" + use_oidc = true +} + variable BASE_NAME {} variable RESOURCE_GROUP {} variable WORKSPACE_NAME {} From b1e2456ae741dd9c6d00f284eddf61c317f319f1 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 11:45:52 +0530 Subject: [PATCH 04/22] added code version --- environment_setup/iac-create-environment-pipeline-tf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-create-environment-pipeline-tf.yml b/environment_setup/iac-create-environment-pipeline-tf.yml index 77b67ae9..e2e7fd71 100644 --- a/environment_setup/iac-create-environment-pipeline-tf.yml +++ b/environment_setup/iac-create-environment-pipeline-tf.yml @@ -24,7 +24,7 @@ steps: - task: TerraformInstaller@1 displayName: 'Use Terraform 0.12.24' inputs: - terraformVersion: 0.12.24 + terraformVersion: 1.9.8 - task: TerraformCLI@0 displayName: 'TF init - Deploy MLOps resources to Azure' From fcdb596b744b4c0354e6aaeb3088578af6f5d699 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 11:50:54 +0530 Subject: [PATCH 05/22] uopdated code --- environment_setup/iac-create-environment-pipeline-tf.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment_setup/iac-create-environment-pipeline-tf.yml b/environment_setup/iac-create-environment-pipeline-tf.yml index e2e7fd71..40d2f11c 100644 --- a/environment_setup/iac-create-environment-pipeline-tf.yml +++ b/environment_setup/iac-create-environment-pipeline-tf.yml @@ -41,6 +41,8 @@ steps: backendAzureRmStorageAccountSku: 'Standard_LRS' backendAzureRmContainerName: 'tfstate-cont' backendAzureRmKey: 'mlopsinfra.tfstate' + env: + ARM_USE_AZUREAD: true - task: TerraformCLI@0 displayName: 'TF validate - Deploy MLOps resources to Azure' From 5cf39d76576c06e3b4d5581c47f2a12376b99705 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:05:07 +0530 Subject: [PATCH 06/22] added --- environment_setup/iac-pipeline.yml | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 environment_setup/iac-pipeline.yml diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml new file mode 100644 index 00000000..a88fc33b --- /dev/null +++ b/environment_setup/iac-pipeline.yml @@ -0,0 +1,50 @@ +trigger: +- main + +pool: + agent: 'mlopspool' + +variables: + - group: devopsforai-aml-vg + - TF_WORKING_DIR: '' # Update with your Terraform directory + +steps: +# Step 1: Install Terraform +- task: TerraformInstaller@0 + inputs: + terraformVersion: 'latest' + +# Step 2: Login to Azure using Service Principal +- task: AzureCLI@2 + inputs: + azureSubscription: '' + scriptType: 'bash' + scriptLocation: 'inlineScript' + inlineScript: | + echo "Logging in with Service Principal..." + az login --service-principal -u $(ARM_CLIENT_ID) -p $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID) + +# Step 3: Initialize Terraform Backend +- script: | + terraform init \ + -backend-config="storage_account_name=$(BASE_NAME)statestor" \ + -backend-config="container_name=tfstate-cont" \ + -backend-config="key=mlopsinfra.tfstate" \ + -backend-config="resource_group_name=$(RESOURCE_GROUP)" \ + -backend-config="client_id=$(ARM_CLIENT_ID)" \ + -backend-config="client_secret=$(ARM_CLIENT_SECRET)" \ + -backend-config="tenant_id=$(ARM_TENANT_ID)" + workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates + displayName: 'Terraform Init' + +# Step 4: Terraform Plan +- script: | + terraform plan -out=tfplan + workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates + displayName: 'Terraform Plan' + +# Step 5: Terraform Apply +- script: | + terraform apply -auto-approve tfplan + workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates + displayName: 'Terraform Apply' From f991c3fd8579d36b6b5edd152a3d7a1e925cfae4 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:07:20 +0530 Subject: [PATCH 07/22] changed code --- environment_setup/iac-pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index a88fc33b..af3f7c9e 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -6,7 +6,6 @@ pool: variables: - group: devopsforai-aml-vg - - TF_WORKING_DIR: '' # Update with your Terraform directory steps: # Step 1: Install Terraform From a92456d8d4c9fd25ce43cad5f8901933ab1da470 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:08:33 +0530 Subject: [PATCH 08/22] changed sub --- environment_setup/iac-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index af3f7c9e..01556439 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -16,7 +16,7 @@ steps: # Step 2: Login to Azure using Service Principal - task: AzureCLI@2 inputs: - azureSubscription: '' + azureSubscription: 'azure-resource-connection' scriptType: 'bash' scriptLocation: 'inlineScript' inlineScript: | From d4806a3dcd3a28c0e72880aa314d0c8f04f94056 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:10:48 +0530 Subject: [PATCH 09/22] modified the agent name --- environment_setup/iac-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index 01556439..509942d5 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -2,7 +2,7 @@ trigger: - main pool: - agent: 'mlopspool' + name: 'mlopspool' variables: - group: devopsforai-aml-vg From 4300027825db2a26c67a9d63feb96cc557aa7646 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:18:20 +0530 Subject: [PATCH 10/22] updated --- environment_setup/iac-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index 509942d5..659f2b05 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -16,7 +16,7 @@ steps: # Step 2: Login to Azure using Service Principal - task: AzureCLI@2 inputs: - azureSubscription: 'azure-resource-connection' + azureSubscription: '1655f00d-a4c4-4ef2-84e1-fe175ad5cf99' scriptType: 'bash' scriptLocation: 'inlineScript' inlineScript: | From 3a59943d2811842bfb0fa51b5219baa98aafc67e Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:24:07 +0530 Subject: [PATCH 11/22] added code --- environment_setup/tf-templates/main.tf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/environment_setup/tf-templates/main.tf b/environment_setup/tf-templates/main.tf index 3f19a7db..e399d512 100644 --- a/environment_setup/tf-templates/main.tf +++ b/environment_setup/tf-templates/main.tf @@ -1,11 +1,7 @@ provider "azurerm" { version = "=2.3.0" features {} -} - -provider "azuredevops" { - org_service_url = "https://dev.azure.com/edforce" - use_oidc = true + use_oidc_token = true } variable BASE_NAME {} From c1a606ea9ef75236f46f1451eada036386677ccd Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:33:23 +0530 Subject: [PATCH 12/22] added --- environment_setup/iac-pipeline.yml | 71 +++++++++++++---------- environment_setup/tf-templates/backend.tf | 6 ++ 2 files changed, 47 insertions(+), 30 deletions(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index 659f2b05..eb4e6cc9 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -13,37 +13,48 @@ steps: inputs: terraformVersion: 'latest' -# Step 2: Login to Azure using Service Principal -- task: AzureCLI@2 +- task: TerraformCLI@0 + displayName: 'Terraform Init' inputs: - azureSubscription: '1655f00d-a4c4-4ef2-84e1-fe175ad5cf99' - scriptType: 'bash' - scriptLocation: 'inlineScript' - inlineScript: | - echo "Logging in with Service Principal..." - az login --service-principal -u $(ARM_CLIENT_ID) -p $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID) + command: 'init' + workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates + environmentServiceName: 'azure-resource-connection' + environmentVariables: + ARM_CLIENT_ID: $(ARM_CLIENT_ID) + ARM_CLIENT_SECRET: $(ARM_CLIENT_SECRET) + ARM_TENANT_ID: $(ARM_TENANT_ID) + ARM_SUBSCRIPTION_ID: $(ARM_SUBSCRIPTION_ID) +# Step 2: Login to Azure using Service Principal +# - task: AzureCLI@2 +# inputs: +# azureSubscription: '1655f00d-a4c4-4ef2-84e1-fe175ad5cf99' +# scriptType: 'bash' +# scriptLocation: 'inlineScript' +# inlineScript: | +# echo "Logging in with Service Principal..." +# az login --service-principal -u $(ARM_CLIENT_ID) -p $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID) -# Step 3: Initialize Terraform Backend -- script: | - terraform init \ - -backend-config="storage_account_name=$(BASE_NAME)statestor" \ - -backend-config="container_name=tfstate-cont" \ - -backend-config="key=mlopsinfra.tfstate" \ - -backend-config="resource_group_name=$(RESOURCE_GROUP)" \ - -backend-config="client_id=$(ARM_CLIENT_ID)" \ - -backend-config="client_secret=$(ARM_CLIENT_SECRET)" \ - -backend-config="tenant_id=$(ARM_TENANT_ID)" - workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - displayName: 'Terraform Init' +# # Step 3: Initialize Terraform Backend +# - script: | +# terraform init \ +# -backend-config="storage_account_name=$(BASE_NAME)statestor" \ +# -backend-config="container_name=tfstate-cont" \ +# -backend-config="key=mlopsinfra.tfstate" \ +# -backend-config="resource_group_name=$(RESOURCE_GROUP)" \ +# -backend-config="client_id=$(ARM_CLIENT_ID)" \ +# -backend-config="client_secret=$(ARM_CLIENT_SECRET)" \ +# -backend-config="tenant_id=$(ARM_TENANT_ID)" +# workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates +# displayName: 'Terraform Init' -# Step 4: Terraform Plan -- script: | - terraform plan -out=tfplan - workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - displayName: 'Terraform Plan' +# # Step 4: Terraform Plan +# - script: | +# terraform plan -out=tfplan +# workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates +# displayName: 'Terraform Plan' -# Step 5: Terraform Apply -- script: | - terraform apply -auto-approve tfplan - workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - displayName: 'Terraform Apply' +# # Step 5: Terraform Apply +# - script: | +# terraform apply -auto-approve tfplan +# workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates +# displayName: 'Terraform Apply' diff --git a/environment_setup/tf-templates/backend.tf b/environment_setup/tf-templates/backend.tf index 0aec0499..ac1558df 100644 --- a/environment_setup/tf-templates/backend.tf +++ b/environment_setup/tf-templates/backend.tf @@ -1,4 +1,10 @@ terraform { backend "azurerm" { + resource_group_name = "mlops-RG" + storage_account_name = "mlopsinfra.tfstate" + container_name = "tfstate-cont" + key = "mlopsinfra.tfstate" + + # These environment variables will be used for Service Principal authentication } } From 95c6a77c91f3b233a75db4505db95ca72070c9e3 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:41:20 +0530 Subject: [PATCH 13/22] test --- environment_setup/iac-pipeline.yml | 32 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index eb4e6cc9..bba79734 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -9,21 +9,35 @@ variables: steps: # Step 1: Install Terraform -- task: TerraformInstaller@0 +- task: TerraformInstaller@1 + displayName: 'Install Terraform' inputs: terraformVersion: 'latest' -- task: TerraformCLI@0 - displayName: 'Terraform Init' +- task: TerraformTaskV4@4 + displayName: 'terraform init' inputs: + provider: 'azurerm' command: 'init' workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - environmentServiceName: 'azure-resource-connection' - environmentVariables: - ARM_CLIENT_ID: $(ARM_CLIENT_ID) - ARM_CLIENT_SECRET: $(ARM_CLIENT_SECRET) - ARM_TENANT_ID: $(ARM_TENANT_ID) - ARM_SUBSCRIPTION_ID: $(ARM_SUBSCRIPTION_ID) + backendServiceArm: azure-resource-connection' + backendAzureRmResourceGroupName: '$(RESOURCE_GROUP)' + backendAzureRmStorageAccountName: '$(BASE_NAME)statestor' + backendAzureRmContainerName: 'tfstate-cont' + backendAzureRmKey: 'mlopsinfra.tfstate' + env: + ARM_USE_AZUREAD: true +# - task: TerraformCLI@0 +# displayName: 'Terraform Init' +# inputs: +# command: 'init' +# workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates +# environmentServiceName: 'azure-resource-connection' +# environmentVariables: +# ARM_CLIENT_ID: $(ARM_CLIENT_ID) +# ARM_CLIENT_SECRET: $(ARM_CLIENT_SECRET) +# ARM_TENANT_ID: $(ARM_TENANT_ID) +# ARM_SUBSCRIPTION_ID: $(ARM_SUBSCRIPTION_ID) # Step 2: Login to Azure using Service Principal # - task: AzureCLI@2 # inputs: From f1896fb4e7a61fe4c30acef763493092d35aef64 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:44:06 +0530 Subject: [PATCH 14/22] iuopdated --- environment_setup/iac-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index bba79734..227c6f74 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -20,7 +20,7 @@ steps: provider: 'azurerm' command: 'init' workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - backendServiceArm: azure-resource-connection' + backendServiceArm: 'azure-resource-connection' backendAzureRmResourceGroupName: '$(RESOURCE_GROUP)' backendAzureRmStorageAccountName: '$(BASE_NAME)statestor' backendAzureRmContainerName: 'tfstate-cont' From 48283e731e1da59923534e6d187ab03d05da047a Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:47:21 +0530 Subject: [PATCH 15/22] changed --- environment_setup/iac-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index 227c6f74..daea9418 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -9,7 +9,7 @@ variables: steps: # Step 1: Install Terraform -- task: TerraformInstaller@1 +- task: TerraformInstaller@0 displayName: 'Install Terraform' inputs: terraformVersion: 'latest' From 2234d05390d57df7d5900fba4af11e2099a07e5f Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:49:04 +0530 Subject: [PATCH 16/22] test --- environment_setup/iac-pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index daea9418..78a3f599 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -9,10 +9,10 @@ variables: steps: # Step 1: Install Terraform -- task: TerraformInstaller@0 - displayName: 'Install Terraform' - inputs: - terraformVersion: 'latest' +# - task: TerraformInstaller@0 +# displayName: 'Install Terraform' +# inputs: +# terraformVersion: 'latest' - task: TerraformTaskV4@4 displayName: 'terraform init' From 859bb57e1b0eda0cd2b4dcec67f1eacccfa339e7 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 12:52:20 +0530 Subject: [PATCH 17/22] adeded --- environment_setup/iac-pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index 78a3f599..f96f3eb8 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -8,6 +8,10 @@ variables: - group: devopsforai-aml-vg steps: +- task: TerraformInstaller@1 + displayName: 'Use Terraform 0.12.24' + inputs: + terraformVersion: 1.9.8 # Step 1: Install Terraform # - task: TerraformInstaller@0 # displayName: 'Install Terraform' From 313910be40c8230bb897c7d5f7ce8bd3c192dcba Mon Sep 17 00:00:00 2001 From: vsm Date: Wed, 20 Nov 2024 13:02:44 +0530 Subject: [PATCH 18/22] Update iac-pipeline.yml for Azure Pipelines --- environment_setup/iac-pipeline.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index f96f3eb8..78a3f599 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -8,10 +8,6 @@ variables: - group: devopsforai-aml-vg steps: -- task: TerraformInstaller@1 - displayName: 'Use Terraform 0.12.24' - inputs: - terraformVersion: 1.9.8 # Step 1: Install Terraform # - task: TerraformInstaller@0 # displayName: 'Install Terraform' From 1049ca7de6219f19c525502cead0b8cb932ea1a6 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 13:07:34 +0530 Subject: [PATCH 19/22] fff --- environment_setup/tf-templates/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/tf-templates/backend.tf b/environment_setup/tf-templates/backend.tf index ac1558df..5817fca6 100644 --- a/environment_setup/tf-templates/backend.tf +++ b/environment_setup/tf-templates/backend.tf @@ -1,7 +1,7 @@ terraform { backend "azurerm" { resource_group_name = "mlops-RG" - storage_account_name = "mlopsinfra.tfstate" + storage_account_name = "mlopsstatestor" container_name = "tfstate-cont" key = "mlopsinfra.tfstate" From c8e39feb2e8d35e7cd3e501dc9e73d67aa5676e4 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 13:54:05 +0530 Subject: [PATCH 20/22] added code --- environment_setup/iac-pipeline.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index 78a3f599..c2f47210 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -20,11 +20,11 @@ steps: provider: 'azurerm' command: 'init' workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - backendServiceArm: 'azure-resource-connection' - backendAzureRmResourceGroupName: '$(RESOURCE_GROUP)' - backendAzureRmStorageAccountName: '$(BASE_NAME)statestor' - backendAzureRmContainerName: 'tfstate-cont' - backendAzureRmKey: 'mlopsinfra.tfstate' + # backendServiceArm: 'azure-resource-connection' + # backendAzureRmResourceGroupName: '$(RESOURCE_GROUP)' + # backendAzureRmStorageAccountName: '$(BASE_NAME)statestor' + # backendAzureRmContainerName: 'tfstate-cont' + # backendAzureRmKey: 'mlopsinfra.tfstate' env: ARM_USE_AZUREAD: true # - task: TerraformCLI@0 From 6470ff2a74f4ced9c187e9f3d96fe4008fa375ca Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 14:00:33 +0530 Subject: [PATCH 21/22] ddded --- environment_setup/iac-pipeline.yml | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index c2f47210..d02f5afe 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -14,19 +14,19 @@ steps: # inputs: # terraformVersion: 'latest' -- task: TerraformTaskV4@4 - displayName: 'terraform init' - inputs: - provider: 'azurerm' - command: 'init' - workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates - # backendServiceArm: 'azure-resource-connection' - # backendAzureRmResourceGroupName: '$(RESOURCE_GROUP)' - # backendAzureRmStorageAccountName: '$(BASE_NAME)statestor' - # backendAzureRmContainerName: 'tfstate-cont' - # backendAzureRmKey: 'mlopsinfra.tfstate' - env: - ARM_USE_AZUREAD: true +# - task: TerraformTaskV4@4 +# displayName: 'terraform init' +# inputs: +# provider: 'azurerm' +# command: 'init' +# workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates +# backendServiceArm: 'azure-resource-connection' +# backendAzureRmResourceGroupName: '$(RESOURCE_GROUP)' +# backendAzureRmStorageAccountName: '$(BASE_NAME)statestor' +# backendAzureRmContainerName: 'tfstate-cont' +# backendAzureRmKey: 'mlopsinfra.tfstate' +# env: +# ARM_USE_AZUREAD: true # - task: TerraformCLI@0 # displayName: 'Terraform Init' # inputs: @@ -39,27 +39,27 @@ steps: # ARM_TENANT_ID: $(ARM_TENANT_ID) # ARM_SUBSCRIPTION_ID: $(ARM_SUBSCRIPTION_ID) # Step 2: Login to Azure using Service Principal -# - task: AzureCLI@2 -# inputs: -# azureSubscription: '1655f00d-a4c4-4ef2-84e1-fe175ad5cf99' -# scriptType: 'bash' -# scriptLocation: 'inlineScript' -# inlineScript: | -# echo "Logging in with Service Principal..." -# az login --service-principal -u $(ARM_CLIENT_ID) -p $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID) +- task: AzureCLI@2 + inputs: + azureSubscription: '1655f00d-a4c4-4ef2-84e1-fe175ad5cf99' + scriptType: 'bash' + scriptLocation: 'inlineScript' + inlineScript: | + echo "Logging in with Service Principal..." + az login --service-principal -u $(ARM_CLIENT_ID) -p $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID) -# # Step 3: Initialize Terraform Backend -# - script: | -# terraform init \ -# -backend-config="storage_account_name=$(BASE_NAME)statestor" \ -# -backend-config="container_name=tfstate-cont" \ -# -backend-config="key=mlopsinfra.tfstate" \ -# -backend-config="resource_group_name=$(RESOURCE_GROUP)" \ -# -backend-config="client_id=$(ARM_CLIENT_ID)" \ -# -backend-config="client_secret=$(ARM_CLIENT_SECRET)" \ -# -backend-config="tenant_id=$(ARM_TENANT_ID)" -# workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates -# displayName: 'Terraform Init' +# Step 3: Initialize Terraform Backend +- script: | + terraform init \ + -backend-config="storage_account_name=$(BASE_NAME)statestor" \ + -backend-config="container_name=tfstate-cont" \ + -backend-config="key=mlopsinfra.tfstate" \ + -backend-config="resource_group_name=$(RESOURCE_GROUP)" \ + -backend-config="client_id=$(ARM_CLIENT_ID)" \ + -backend-config="client_secret=$(ARM_CLIENT_SECRET)" \ + -backend-config="tenant_id=$(ARM_TENANT_ID)" + workingDirectory: $(Build.SourcesDirectory)/environment_setup/tf-templates + displayName: 'Terraform Init' # # Step 4: Terraform Plan # - script: | From 194fbb88e56ebc8832218f1bbee2587ac8bdebb1 Mon Sep 17 00:00:00 2001 From: Ravi Date: Wed, 20 Nov 2024 14:02:34 +0530 Subject: [PATCH 22/22] added --- environment_setup/iac-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment_setup/iac-pipeline.yml b/environment_setup/iac-pipeline.yml index d02f5afe..f156e977 100644 --- a/environment_setup/iac-pipeline.yml +++ b/environment_setup/iac-pipeline.yml @@ -41,7 +41,7 @@ steps: # Step 2: Login to Azure using Service Principal - task: AzureCLI@2 inputs: - azureSubscription: '1655f00d-a4c4-4ef2-84e1-fe175ad5cf99' + azureSubscription: 'azure-resource-connection' scriptType: 'bash' scriptLocation: 'inlineScript' inlineScript: |