Merge pull request #93 from Ensono/upgrade-taskctl-and-context

upgrade taskctl to 1.7.5
Ensono · Feb 4, 2025 · 26fefaa · 26fefaa
2 parents a0ce4a4 + 3d15fa4
commit 26fefaa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml
@@ -16,7 +16,7 @@ env:
   #   AWS_TF_STATE_BUCKET
   #   AWS_TF_STATE_DYNAMOTABLE
   CLOUD_PROVIDER: "aws"
-  TaskctlVersion: '1.7.2'
+  TaskctlVersion: '1.7.5'
   TF_INFRA_FILE_LOCATION: deploy/aws/infra
   TF_PRE_INFRA_FILE_LOCATION: deploy/aws/pre-infra
 

diff --git a/build/taskctl/contexts.yaml b/build/taskctl/contexts.yaml
@@ -2,26 +2,16 @@
 
 contexts:
   powershell:
-    executable:
-      bin: docker
-      args:
-        - run
-        - --rm
-        - -v
-        - ${PWD}:/app
-        - -v
-        - /var/run/docker.sock:/var/run/docker.sock
-        - -w
-        - /app
-        - --env-file
-        - envfile
-        - ensono/eir-infrastructure:1.1.257
-        - pwsh
-        - -NonInteractive
-        - -Command
-    quote: "'"
+    container:
+      name: ensono/eir-infrastructure:1.1.257
+      shell: pwsh
+      shell_args: [
+        "-NonInteractive",
+        "-Command"
+      ]
+    env:
+      PSModulePath: /modules
     envfile:
-      generate: true
       exclude:
         - PATH
         - SOURCEVERSIONMESSAGE

diff --git a/build/taskctl/tasks.yaml b/build/taskctl/tasks.yaml
@@ -61,17 +61,17 @@ tasks:
     command:
       - |
         Write-Host "Getting 'pre-infra' Terraform Outputs..."
-        Invoke-Terraform -Output -Path ${env:TF_PRE_INFRA_FILE_LOCATION} | /app/build/scripts/Set-EnvironmentVars.ps1 -prefix "TFOUT" -key "value"
+        Invoke-Terraform -Output -Path ${env:TF_PRE_INFRA_FILE_LOCATION} | /workspace/.taskctl/build/scripts/Set-EnvironmentVars.ps1 -prefix "TFOUT" -key "value"
 
         Write-Host "Getting 'infra' Terraform Outputs..."
-        Invoke-Terraform -Output -Path ${env:TF_INFRA_FILE_LOCATION} | /app/build/scripts/Set-EnvironmentVars.ps1 -prefix "TFOUT" -key "value"
+        Invoke-Terraform -Output -Path ${env:TF_INFRA_FILE_LOCATION} | /workspace/.taskctl/build/scripts/Set-EnvironmentVars.ps1 -prefix "TFOUT" -key "value"
 
         # If we are not currently managing the Auth Config Map through Helm then remove it...
-        /app/build/scripts/Remove-AwsAuthConfigMap.ps1 `
+        /workspace/.taskctl/build/scripts/Remove-AwsAuthConfigMap.ps1 `
           -Identifier ${env:REGION} `
           -ClusterName ${env:TFOUT_cluster_name}
 
-        /app/build/scripts/Deploy-HelmCharts.ps1 /app/deploy/helm/k8s_apps.yaml `
+        /workspace/.taskctl/build/scripts/Deploy-HelmCharts.ps1 /workspace/.taskctl/deploy/helm/k8s_apps.yaml `
           -Identifier ${env:REGION} `
           -ClusterName ${env:TFOUT_cluster_name} `
           -Provider ${env:CLOUD_PROVIDER} `
@@ -89,7 +89,7 @@ tasks:
           exit 0
         }
 
-        Invoke-Terraform -Output -Path ${env:TF_FILE_LOCATION} | /app/build/scripts/Set-EnvironmentVars.ps1 -prefix "TFOUT" -key "value"
+        Invoke-Terraform -Output -Path ${env:TF_FILE_LOCATION} | /workspace/.taskctl/build/scripts/Set-EnvironmentVars.ps1 -prefix "TFOUT" -key "value"
 
         Write-Host "Make sure to add these Name Servers to an NS record for '${TF_VAR_dns_hostedzone_name}.' with the values:`n${env:TFOUT_dns_hostedzone_ns_records}"