Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade taskctl to 1.7.5 #93

Merged
merged 5 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
28 changes: 9 additions & 19 deletions build/taskctl/contexts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions build/taskctl/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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} `
Expand All @@ -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}"

Expand Down