Skip to content

Commit 379cbc7

Browse files
RamyasreeChakkaRamyasreeChakka
authored
Merge pull request #51 from thomasyip-msft/hoyip/update
Update Kubernetes version to 1.32.6 and remove HTTP application routing from multiple ARM templates
2 parents f641437 + 2faa21d commit 379cbc7

File tree

11 files changed

+68
-301
lines changed

11 files changed

+68
-301
lines changed

‎samples/datatype-sample/mainTemplate.json‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
},
8585
"kubernetesVersion": {
8686
"type": "String",
87-
"defaultValue": "1.26.3",
87+
"defaultValue": "1.32.6",
8888
"metadata": {
8989
"description": "The version of Kubernetes."
9090
}
@@ -114,27 +114,6 @@
114114
"description": "Enable private network access to the Kubernetes cluster."
115115
}
116116
},
117-
"enableHttpApplicationRouting": {
118-
"defaultValue": true,
119-
"type": "Bool",
120-
"metadata": {
121-
"description": "Boolean flag to turn on and off http application routing."
122-
}
123-
},
124-
"enableAzurePolicy": {
125-
"defaultValue": false,
126-
"type": "Bool",
127-
"metadata": {
128-
"description": "Boolean flag to turn on and off Azure Policy addon."
129-
}
130-
},
131-
"enableSecretStoreCSIDriver": {
132-
"defaultValue": false,
133-
"type": "Bool",
134-
"metadata": {
135-
"description": "Boolean flag to turn on and off secret store CSI driver."
136-
}
137-
},
138117
"osSKU": {
139118
"type": "string",
140119
"defaultValue": "AzureLinux",
@@ -179,13 +158,13 @@
179158
{
180159
"type": "Microsoft.ContainerService/managedClusters",
181160
"condition": "[parameters('createNewCluster')]",
182-
"apiVersion": "2024-05-01",
161+
"apiVersion": "2025-04-01",
183162
"name": "[parameters('clusterResourceName')]",
184163
"location": "[parameters('location')]",
185164
"dependsOn": [],
186165
"tags": {},
187166
"sku": {
188-
"name": "Basic",
167+
"name": "Base",
189168
"tier": "Free"
190169
},
191170
"identity": {
@@ -195,6 +174,10 @@
195174
"kubernetesVersion": "[parameters('kubernetesVersion')]",
196175
"enableRBAC": "[parameters('enableRBAC')]",
197176
"dnsPrefix": "[parameters('dnsPrefix')]",
177+
"autoUpgradeProfile": {
178+
"upgradeChannel": "patch",
179+
"nodeOSUpgradeChannel": "NodeImage"
180+
},
198181
"agentPoolProfiles": [
199182
{
200183
"name": "agentpool",
@@ -206,7 +189,6 @@
206189
"vmSize": "[parameters('vmSize')]",
207190
"osType": "Linux",
208191
"osSKU": "[parameters('osSKU')]",
209-
"storageProfile": "ManagedDisks",
210192
"type": "VirtualMachineScaleSets",
211193
"mode": "System",
212194
"maxPods": 110,
@@ -221,23 +203,12 @@
221203
},
222204
"apiServerAccessProfile": {
223205
"enablePrivateCluster": "[parameters('enablePrivateCluster')]"
224-
},
225-
"addonProfiles": {
226-
"httpApplicationRouting": {
227-
"enabled": "[parameters('enableHttpApplicationRouting')]"
228-
},
229-
"azurepolicy": {
230-
"enabled": "[parameters('enableAzurePolicy')]"
231-
},
232-
"azureKeyvaultSecretsProvider": {
233-
"enabled": "[parameters('enableSecretStoreCSIDriver')]"
234-
}
235206
}
236207
}
237208
},
238209
{
239210
"type": "Microsoft.KubernetesConfiguration/extensions",
240-
"apiVersion": "2023-05-01",
211+
"apiVersion": "2024-11-01",
241212
"name": "[parameters('extensionResourceName')]",
242213
"properties": {
243214
"extensionType": "[variables('clusterExtensionTypeName')]",

‎samples/dynamic-configuration-settings-sample/mainTemplate.json‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
},
7979
"kubernetesVersion": {
8080
"type": "String",
81-
"defaultValue": "1.26.3",
81+
"defaultValue": "1.32.6",
8282
"metadata": {
8383
"description": "The version of Kubernetes."
8484
}
@@ -108,27 +108,6 @@
108108
"description": "Enable private network access to the Kubernetes cluster."
109109
}
110110
},
111-
"enableHttpApplicationRouting": {
112-
"defaultValue": true,
113-
"type": "Bool",
114-
"metadata": {
115-
"description": "Boolean flag to turn on and off http application routing."
116-
}
117-
},
118-
"enableAzurePolicy": {
119-
"defaultValue": false,
120-
"type": "Bool",
121-
"metadata": {
122-
"description": "Boolean flag to turn on and off Azure Policy addon."
123-
}
124-
},
125-
"enableSecretStoreCSIDriver": {
126-
"defaultValue": false,
127-
"type": "Bool",
128-
"metadata": {
129-
"description": "Boolean flag to turn on and off secret store CSI driver."
130-
}
131-
},
132111
"osSKU": {
133112
"type": "string",
134113
"defaultValue": "AzureLinux",
@@ -176,13 +155,13 @@
176155
{
177156
"type": "Microsoft.ContainerService/managedClusters",
178157
"condition": "[parameters('createNewCluster')]",
179-
"apiVersion": "2024-05-01",
158+
"apiVersion": "2025-04-01",
180159
"name": "[parameters('clusterResourceName')]",
181160
"location": "[parameters('location')]",
182161
"dependsOn": [],
183162
"tags": {},
184163
"sku": {
185-
"name": "Basic",
164+
"name": "Base",
186165
"tier": "Free"
187166
},
188167
"identity": {
@@ -192,6 +171,10 @@
192171
"kubernetesVersion": "[parameters('kubernetesVersion')]",
193172
"enableRBAC": "[parameters('enableRBAC')]",
194173
"dnsPrefix": "[parameters('dnsPrefix')]",
174+
"autoUpgradeProfile": {
175+
"upgradeChannel": "patch",
176+
"nodeOSUpgradeChannel": "NodeImage"
177+
},
195178
"agentPoolProfiles": [
196179
{
197180
"name": "agentpool",
@@ -203,7 +186,6 @@
203186
"vmSize": "[parameters('vmSize')]",
204187
"osType": "Linux",
205188
"osSKU": "[parameters('osSKU')]",
206-
"storageProfile": "ManagedDisks",
207189
"type": "VirtualMachineScaleSets",
208190
"mode": "System",
209191
"maxPods": 110,
@@ -218,23 +200,12 @@
218200
},
219201
"apiServerAccessProfile": {
220202
"enablePrivateCluster": "[parameters('enablePrivateCluster')]"
221-
},
222-
"addonProfiles": {
223-
"httpApplicationRouting": {
224-
"enabled": "[parameters('enableHttpApplicationRouting')]"
225-
},
226-
"azurepolicy": {
227-
"enabled": "[parameters('enableAzurePolicy')]"
228-
},
229-
"azureKeyvaultSecretsProvider": {
230-
"enabled": "[parameters('enableSecretStoreCSIDriver')]"
231-
}
232203
}
233204
}
234205
},
235206
{
236207
"type": "Microsoft.KubernetesConfiguration/extensions",
237-
"apiVersion": "2023-05-01",
208+
"apiVersion": "2024-11-01",
238209
"name": "[parameters('extensionResourceName')]",
239210
"properties": {
240211
"extensionType": "[variables('clusterExtensionTypeName')]",

‎samples/k8s-connectedcluster-only/mainTemplate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"resources": [
3535
{
3636
"type": "Microsoft.KubernetesConfiguration/extensions",
37-
"apiVersion": "2023-05-01",
37+
"apiVersion": "2024-11-01",
3838
"name": "[parameters('extensionResourceName')]",
3939
"properties": {
4040
"extensionType": "[variables('clusterExtensionTypeName')]",

‎samples/k8s-existing-cluster-only-sample/mainTemplate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"resources": [
2626
{
2727
"type": "Microsoft.KubernetesConfiguration/extensions",
28-
"apiVersion": "2023-05-01",
28+
"apiVersion": "2024-11-01",
2929
"name": "[parameters('extensionResourceName')]",
3030
"dependsOn": [
3131
],

‎samples/k8s-offer-azure-vote-custom-meters/mainTemplate.json‎

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
},
7676
"kubernetesVersion": {
7777
"type": "String",
78-
"defaultValue": "1.26.3",
78+
"defaultValue": "1.32.6",
7979
"metadata": {
8080
"description": "The version of Kubernetes."
8181
}
@@ -105,27 +105,6 @@
105105
"description": "Enable private network access to the Kubernetes cluster."
106106
}
107107
},
108-
"enableHttpApplicationRouting": {
109-
"defaultValue": true,
110-
"type": "Bool",
111-
"metadata": {
112-
"description": "Boolean flag to turn on and off http application routing."
113-
}
114-
},
115-
"enableAzurePolicy": {
116-
"defaultValue": false,
117-
"type": "Bool",
118-
"metadata": {
119-
"description": "Boolean flag to turn on and off Azure Policy addon."
120-
}
121-
},
122-
"enableSecretStoreCSIDriver": {
123-
"defaultValue": false,
124-
"type": "Bool",
125-
"metadata": {
126-
"description": "Boolean flag to turn on and off secret store CSI driver."
127-
}
128-
},
129108
"osSKU": {
130109
"type": "string",
131110
"defaultValue": "azurelinux",
@@ -149,13 +128,13 @@
149128
{
150129
"type": "Microsoft.ContainerService/managedClusters",
151130
"condition": "[parameters('createNewCluster')]",
152-
"apiVersion": "2024-05-01",
131+
"apiVersion": "2025-04-01",
153132
"name": "[parameters('clusterResourceName')]",
154133
"location": "[parameters('location')]",
155134
"dependsOn": [],
156135
"tags": {},
157136
"sku": {
158-
"name": "Basic",
137+
"name": "Base",
159138
"tier": "Free"
160139
},
161140
"identity": {
@@ -165,6 +144,10 @@
165144
"kubernetesVersion": "[parameters('kubernetesVersion')]",
166145
"enableRBAC": "[parameters('enableRBAC')]",
167146
"dnsPrefix": "[parameters('dnsPrefix')]",
147+
"autoUpgradeProfile": {
148+
"upgradeChannel": "patch",
149+
"nodeOSUpgradeChannel": "NodeImage"
150+
},
168151
"agentPoolProfiles": [
169152
{
170153
"name": "agentpool",
@@ -176,7 +159,6 @@
176159
"vmSize": "[parameters('vmSize')]",
177160
"osType": "Linux",
178161
"osSKU": "[parameters('osSKU')]",
179-
"storageProfile": "ManagedDisks",
180162
"type": "VirtualMachineScaleSets",
181163
"mode": "System",
182164
"maxPods": 110,
@@ -191,23 +173,12 @@
191173
},
192174
"apiServerAccessProfile": {
193175
"enablePrivateCluster": "[parameters('enablePrivateCluster')]"
194-
},
195-
"addonProfiles": {
196-
"httpApplicationRouting": {
197-
"enabled": "[parameters('enableHttpApplicationRouting')]"
198-
},
199-
"azurepolicy": {
200-
"enabled": "[parameters('enableAzurePolicy')]"
201-
},
202-
"azureKeyvaultSecretsProvider": {
203-
"enabled": "[parameters('enableSecretStoreCSIDriver')]"
204-
}
205176
}
206177
}
207178
},
208179
{
209180
"type": "Microsoft.KubernetesConfiguration/extensions",
210-
"apiVersion": "2023-05-01",
181+
"apiVersion": "2024-11-01",
211182
"name": "[parameters('extensionResourceName')]",
212183
"properties": {
213184
"extensionType": "[variables('clusterExtensionTypeName')]",

‎samples/k8s-offer-azure-vote/azure-vote/src/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0
2-
3-
RUN tdnf install -y python3-pip
1+
FROM mcr.microsoft.com/azurelinux/base/python:3.12
42

53
# We copy just the requirements.txt first to leverage Docker cache
64
COPY ./requirements.txt /app/requirements.txt
@@ -11,4 +9,5 @@ RUN pip install -r requirements.txt
119

1210
COPY . /app
1311

14-
ENTRYPOINT FLASK_APP=/app/main.py flask run --host=0.0.0.0 --port=80
12+
ENV FLASK_APP=/app/main.py
13+
ENTRYPOINT ["flask", "run", "--host=0.0.0.0", "--port=80"]

0 commit comments

Comments
 (0)