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

Changes to fix pipeline issues #667

Merged
merged 8 commits into from
Oct 25, 2023
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/ByoVnetCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ permissions:
concurrency: ci-${{ github.ref }}

env:
AZCLIVERSION: 2.43.0 #2.30.0 #2.29.2 #2.26.0 #latest
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
ParamFilePath: ".github/workflows_dep/AksDeploy-ByoVnet.parameters.json"
RESNAME: "Byov"
DEPNAME: "Dep${{ github.run_number }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ByoVnetPrivateCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ on:
env:
ParamFilePath: ".github/workflows_dep/AksDeploy-Private.parameters.json"
DEPNAME: 'DepPriv${{ github.run_number }}'
AZCLIVERSION: 2.43.0 #2.36.0 #2.30.0 #Pinning to a specific AZ CLI version
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

concurrency: ci-${{ github.event.inputs.environment }}-${{ github.ref }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/OSSCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ env:
RG: "AksBicepAcc-Ci-OssCluster" #The resource group we're deploying to.
RESNAME: "AksOss" #Used in Azure Resource Naming, overrides the default in the parameter file
DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

permissions:
id-token: write
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
LATEST=$(curl https://api.github.com/repos/Azure/AKS-Construction/releases/latest | jq '.tag_name' -r)
echo "LATEST=$LATEST" >> $GITHUB_OUTPUT

ContourDeploy:
uses: ./.github/workflows/AKSC_Deploy.yml
needs: [ReusableWF]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/StandardCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ 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/0.10.2/.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
RESNAME: "AksStan" #Used in Azure Resource Naming, overrides the default in the parameter file
DEPNAME: "Dep${{ github.run_number }}" #Deployment Name
AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

permissions:
id-token: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ghpagesTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
required: true

env:
AZCLIVERSION: 2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

jobs:
Validation:
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:

- name: Html Broken Link Checker
id: lychee
uses: lycheeverse/lychee-action@v1.8.0
uses: lycheeverse/lychee-action@v1.7.0
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regressionparams.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
env:
RG: "AksBicepAcc-Ci-HelperValidate" #The resource group we're deploying to.
ParamDir: ".github/workflows_dep/regressionparams/" #Path to parameter file
AZCLIVERSION: 2.43.0 #Pinning to a specific AZ CLI version
AZCLIVERSION: 2.53.0 #2.43.0 #2.34.1 #2.29.2 #2.26.0 #latest

jobs:
GetParamFiles:
Expand Down
2 changes: 1 addition & 1 deletion bicep/aksagentpool.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ param autoTaintWindows bool = false

var taints = autoTaintWindows ? union(nodeTaints, ['sku=Windows:NoSchedule']) : nodeTaints

resource aks 'Microsoft.ContainerService/managedClusters@2021-10-01' existing = {
resource aks 'Microsoft.ContainerService/managedClusters@2023-07-02-preview' existing = {
name: AksName
}

Expand Down
6 changes: 5 additions & 1 deletion bicep/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,7 @@ param serviceMeshProfile string = ''

@description('The ingress gateway to use for the Istio service mesh')
param istioIngressGatewayMode string = ''
param istioRevision string = 'asm-1-17'

var serviceMeshProfileObj = {
istio: {
Expand All @@ -1116,6 +1117,9 @@ var serviceMeshProfileObj = {
mode: istioIngressGatewayMode
}]
}
revisions: [
istioRevision
]
}
mode: 'Istio'
}
Expand Down Expand Up @@ -1336,7 +1340,7 @@ keyVaultKmsCreateAndPrereqs || !empty(keyVaultKmsByoKeyId) ? azureKeyVaultKms :
!empty(serviceMeshProfile) ? { serviceMeshProfile: serviceMeshProfileObj } : {}
)

resource aks 'Microsoft.ContainerService/managedClusters@2023-05-02-preview' = {
resource aks 'Microsoft.ContainerService/managedClusters@2023-07-02-preview' = {
name: 'aks-${resourceName}'
location: location
properties: aksProperties
Expand Down
Loading