Skip to content

Commit

Permalink
Updated another reference to natGateway
Browse files Browse the repository at this point in the history
Updated workflow to use in-branch version of AksDeploy-Basic.parameters.json isntead of hosted version (which won't be up-to-date with any changes in current branch)
  • Loading branch information
pjlewisuk authored Aug 8, 2024
1 parent cf197a8 commit c953131
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/StandardCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ on:
- cron: "0 23 * * 2"
env:
RG: "AksBicepAcc-Ci-BasicCluster" #The resource group we're deploying to.
ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/main/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
# ParamFilePath: "https://raw.githubusercontent.com/Azure/AKS-Construction/main/.github/workflows_dep/AksDeploy-Basic.parameters.json" # ".github/workflows_dep/AksDeploy-Basic.parameters.json" #Path to parameter file
ParamFilePath: ".github/workflows_dep/AksDeploy-Basic.parameters.json" # Path to parameter file
RESNAME: "AksStan" #Used in Azure Resource Naming, overrides the default in the parameter file
DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
Expand Down
2 changes: 1 addition & 1 deletion bicep/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ var serviceMeshProfileObj = {
}

@description('This resolves the friendly natGateway to the actual outbound traffic type value used by AKS')
var outboundTrafficType = aksOutboundTrafficType=='natGateway' ? ( custom_vnet ? 'userAssignedNATGateway' : 'managedNATGateway' ) : aksOutboundTrafficType
var outboundTrafficType = aksOutboundTrafficType=='managedNATGateway' ? ( custom_vnet ? 'userAssignedNATGateway' : 'managedNATGateway' ) : aksOutboundTrafficType

@description('System Pool presets are derived from the recommended system pool specs')
var systemPoolPresets = {
Expand Down

0 comments on commit c953131

Please sign in to comment.