Skip to content

Commit 379eea2

Browse files
chgennarchgennar
authored
AIO 2504 Release (#73)
1 parent 0705b19 commit 379eea2

2 files changed

Lines changed: 163 additions & 25 deletions

File tree

‎release/azure-iot-operations-enablement.json‎

Lines changed: 75 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.33.93.31351",
9-
"templateHash": "11919718419833561801"
8+
"version": "0.34.44.8038",
9+
"templateHash": "14730289139762308894"
1010
}
1111
},
1212
"definitions": {
@@ -109,6 +109,10 @@
109109
"faultToleranceEnabled": {
110110
"type": "bool",
111111
"nullable": true
112+
},
113+
"diskMountPoint": {
114+
"type": "string",
115+
"nullable": true
112116
}
113117
},
114118
"nullable": true
@@ -223,6 +227,70 @@
223227
}
224228
}
225229
},
230+
"_1.Features": {
231+
"type": "object",
232+
"properties": {},
233+
"additionalProperties": {
234+
"$ref": "#/definitions/_1.InstanceFeature",
235+
"metadata": {
236+
"description": "Object of features"
237+
}
238+
},
239+
"metadata": {
240+
"description": "AIO Instance features.",
241+
"__bicep_imported_from!": {
242+
"sourceTemplate": "types.bicep"
243+
}
244+
}
245+
},
246+
"_1.InstanceFeature": {
247+
"type": "object",
248+
"properties": {
249+
"mode": {
250+
"$ref": "#/definitions/_1.InstanceFeatureMode"
251+
},
252+
"settings": {
253+
"type": "object",
254+
"properties": {},
255+
"additionalProperties": {
256+
"$ref": "#/definitions/_1.InstanceFeatureSettingValue"
257+
}
258+
}
259+
},
260+
"metadata": {
261+
"description": "Individual feature object within the AIO instance.",
262+
"__bicep_imported_from!": {
263+
"sourceTemplate": "types.bicep"
264+
}
265+
}
266+
},
267+
"_1.InstanceFeatureMode": {
268+
"type": "string",
269+
"allowedValues": [
270+
"Disabled",
271+
"Preview",
272+
"Stable"
273+
],
274+
"metadata": {
275+
"description": "The mode of the AIO instance feature. Either \"Stable\", \"Preview\" or \"Disabled\".",
276+
"__bicep_imported_from!": {
277+
"sourceTemplate": "types.bicep"
278+
}
279+
}
280+
},
281+
"_1.InstanceFeatureSettingValue": {
282+
"type": "string",
283+
"allowedValues": [
284+
"Disabled",
285+
"Enabled"
286+
],
287+
"metadata": {
288+
"description": "The setting value of the AIO instance feature. Either \"Enabled\" or \"Disabled\".",
289+
"__bicep_imported_from!": {
290+
"sourceTemplate": "types.bicep"
291+
}
292+
}
293+
},
226294
"_1.SelfSigned": {
227295
"type": "object",
228296
"properties": {
@@ -311,9 +379,9 @@
311379
},
312380
"variables": {
313381
"VERSIONS": {
314-
"platform": "0.7.11",
382+
"platform": "0.7.12",
315383
"secretStore": "0.8.2",
316-
"containerStorage": "2.3.2"
384+
"containerStorage": "2.4.0"
317385
},
318386
"TRAINS": {
319387
"platform": "preview",
@@ -322,7 +390,8 @@
322390
},
323391
"faultTolerantStorageClass": "[coalesce(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'diskStorageClass'), 'acstor-arccontainerstorage-storage-pool')]",
324392
"nonFaultTolerantStorageClass": "[coalesce(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'diskStorageClass'), 'default,local-path')]",
325-
"kubernetesStorageClass": "[if(equals(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'faultToleranceEnabled'), true()), variables('faultTolerantStorageClass'), variables('nonFaultTolerantStorageClass'))]"
393+
"diskStorageClass": "[if(equals(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'faultToleranceEnabled'), true()), variables('faultTolerantStorageClass'), variables('nonFaultTolerantStorageClass'))]",
394+
"diskMountPoint": "[coalesce(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'diskMountPoint'), '/mnt')]"
326395
},
327396
"resources": {
328397
"cluster": {
@@ -387,7 +456,7 @@
387456
"autoUpgradeMinorVersion": false,
388457
"version": "[coalesce(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'version'), variables('VERSIONS').containerStorage)]",
389458
"releaseTrain": "[coalesce(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'train'), variables('TRAINS').containerStorage)]",
390-
"configurationSettings": "[union(createObject('edgeStorageConfiguration.create', 'true', 'feature.diskStorageClass', variables('kubernetesStorageClass')), if(equals(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'faultToleranceEnabled'), true()), createObject('acstorConfiguration.create', 'true', 'acstorConfiguration.properties.diskMountPoint', '/mnt'), createObject()))]"
459+
"configurationSettings": "[union(createObject('edgeStorageConfiguration.create', 'true', 'feature.diskStorageClass', variables('diskStorageClass')), if(equals(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'faultToleranceEnabled'), true()), createObject('acstorConfiguration.create', 'true', 'acstorConfiguration.properties.diskMountPoint', variables('diskMountPoint')), createObject()))]"
391460
},
392461
"dependsOn": [
393462
"aio_platform_extension"

‎release/azure-iot-operations-instance.json‎

Lines changed: 88 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.33.93.31351",
9-
"templateHash": "10984448815531393873"
8+
"version": "0.34.44.8038",
9+
"templateHash": "4820379854816397418"
1010
}
1111
},
1212
"definitions": {
@@ -109,6 +109,10 @@
109109
"faultToleranceEnabled": {
110110
"type": "bool",
111111
"nullable": true
112+
},
113+
"diskMountPoint": {
114+
"type": "string",
115+
"nullable": true
112116
}
113117
},
114118
"nullable": true
@@ -223,6 +227,70 @@
223227
}
224228
}
225229
},
230+
"_1.Features": {
231+
"type": "object",
232+
"properties": {},
233+
"additionalProperties": {
234+
"$ref": "#/definitions/_1.InstanceFeature",
235+
"metadata": {
236+
"description": "Object of features"
237+
}
238+
},
239+
"metadata": {
240+
"description": "AIO Instance features.",
241+
"__bicep_imported_from!": {
242+
"sourceTemplate": "types.bicep"
243+
}
244+
}
245+
},
246+
"_1.InstanceFeature": {
247+
"type": "object",
248+
"properties": {
249+
"mode": {
250+
"$ref": "#/definitions/_1.InstanceFeatureMode"
251+
},
252+
"settings": {
253+
"type": "object",
254+
"properties": {},
255+
"additionalProperties": {
256+
"$ref": "#/definitions/_1.InstanceFeatureSettingValue"
257+
}
258+
}
259+
},
260+
"metadata": {
261+
"description": "Individual feature object within the AIO instance.",
262+
"__bicep_imported_from!": {
263+
"sourceTemplate": "types.bicep"
264+
}
265+
}
266+
},
267+
"_1.InstanceFeatureMode": {
268+
"type": "string",
269+
"allowedValues": [
270+
"Disabled",
271+
"Preview",
272+
"Stable"
273+
],
274+
"metadata": {
275+
"description": "The mode of the AIO instance feature. Either \"Stable\", \"Preview\" or \"Disabled\".",
276+
"__bicep_imported_from!": {
277+
"sourceTemplate": "types.bicep"
278+
}
279+
}
280+
},
281+
"_1.InstanceFeatureSettingValue": {
282+
"type": "string",
283+
"allowedValues": [
284+
"Disabled",
285+
"Enabled"
286+
],
287+
"metadata": {
288+
"description": "The setting value of the AIO instance feature. Either \"Enabled\" or \"Disabled\".",
289+
"__bicep_imported_from!": {
290+
"sourceTemplate": "types.bicep"
291+
}
292+
}
293+
},
226294
"_1.SelfSigned": {
227295
"type": "object",
228296
"properties": {
@@ -371,6 +439,13 @@
371439
"description": "Schema Registry Id used to reference the namespace to be passed in to the to be passed to Instance."
372440
}
373441
},
442+
"features": {
443+
"$ref": "#/definitions/_1.Features",
444+
"nullable": true,
445+
"metadata": {
446+
"description": "AIO Instance features."
447+
}
448+
},
374449
"brokerConfig": {
375450
"$ref": "#/definitions/_1.BrokerConfig",
376451
"nullable": true,
@@ -410,14 +485,15 @@
410485
}
411486
},
412487
"VERSIONS": {
413-
"iotOperations": "1.0.34"
488+
"iotOperations": "1.1.19"
414489
},
415490
"TRAINS": {
416491
"iotOperations": "stable"
417492
},
418493
"MQTT_SETTINGS": {
419494
"brokerListenerServiceName": "aio-broker",
420495
"brokerListenerPort": 18883,
496+
"brokerListenerHost": "[format('aio-broker.{0}', variables('AIO_EXTENSION_SCOPE').cluster.releaseNamespace)]",
421497
"serviceAccountAudience": "aio-internal",
422498
"selfSignedIssuerName": "[format('{0}-aio-certificate-issuer', parameters('clusterNamespace'))]",
423499
"selfSignedConfigMapName": "[format('{0}-aio-ca-trust-bundle', parameters('clusterNamespace'))]"
@@ -437,7 +513,6 @@
437513
"connectors.values.mqttBroker.serviceAccountTokenAudience": "[variables('MQTT_SETTINGS').serviceAccountAudience]",
438514
"connectors.values.opcPlcSimulation.deploy": "false",
439515
"connectors.values.opcPlcSimulation.autoAcceptUntrustedCertificates": "false",
440-
"connectors.values.discoveryHandler.enabled": "false",
441516
"adr.values.Microsoft.CustomLocation.ServiceAccount": "default",
442517
"akri.values.webhookConfiguration.enabled": "false",
443518
"akri.values.certManagerWebhookCertificate.enabled": "false",
@@ -541,27 +616,22 @@
541616
},
542617
"aioInstance": {
543618
"type": "Microsoft.IoTOperations/instances",
544-
"apiVersion": "2024-11-01",
619+
"apiVersion": "2025-04-01",
545620
"name": "[format('aio-{0}', coalesce(tryGet(parameters('advancedConfig'), 'resourceSuffix'), take(uniqueString(resourceGroup().id, parameters('clusterName'), parameters('clusterNamespace')), 5)))]",
546621
"location": "[parameters('clusterLocation')]",
547622
"extendedLocation": {
548623
"name": "[resourceId('Microsoft.ExtendedLocation/customLocations', parameters('customLocationName'))]",
549624
"type": "CustomLocation"
550625
},
551626
"identity": "[if(empty(parameters('userAssignedIdentity')), createObject('type', 'None'), createObject('type', 'UserAssigned', 'userAssignedIdentities', createObject(format('{0}', parameters('userAssignedIdentity')), createObject())))]",
552-
"properties": {
553-
"description": "An AIO instance.",
554-
"schemaRegistryRef": {
555-
"resourceId": "[parameters('schemaRegistryId')]"
556-
}
557-
},
627+
"properties": "[union(createObject('description', 'An AIO instance.', 'schemaRegistryRef', createObject('resourceId', parameters('schemaRegistryId'))), if(equals(parameters('features'), null()), createObject(), createObject('features', parameters('features'))))]",
558628
"dependsOn": [
559629
"customLocation"
560630
]
561631
},
562632
"broker": {
563633
"type": "Microsoft.IoTOperations/instances/brokers",
564-
"apiVersion": "2024-11-01",
634+
"apiVersion": "2025-04-01",
565635
"name": "[format('{0}/{1}', format('aio-{0}', coalesce(tryGet(parameters('advancedConfig'), 'resourceSuffix'), take(uniqueString(resourceGroup().id, parameters('clusterName'), parameters('clusterNamespace')), 5))), 'default')]",
566636
"extendedLocation": {
567637
"name": "[resourceId('Microsoft.ExtendedLocation/customLocations', parameters('customLocationName'))]",
@@ -591,7 +661,7 @@
591661
},
592662
"broker_authn": {
593663
"type": "Microsoft.IoTOperations/instances/brokers/authentications",
594-
"apiVersion": "2024-11-01",
664+
"apiVersion": "2025-04-01",
595665
"name": "[format('{0}/{1}/{2}', format('aio-{0}', coalesce(tryGet(parameters('advancedConfig'), 'resourceSuffix'), take(uniqueString(resourceGroup().id, parameters('clusterName'), parameters('clusterNamespace')), 5))), 'default', 'default')]",
596666
"extendedLocation": {
597667
"name": "[resourceId('Microsoft.ExtendedLocation/customLocations', parameters('customLocationName'))]",
@@ -616,7 +686,7 @@
616686
},
617687
"broker_listener": {
618688
"type": "Microsoft.IoTOperations/instances/brokers/listeners",
619-
"apiVersion": "2024-11-01",
689+
"apiVersion": "2025-04-01",
620690
"name": "[format('{0}/{1}/{2}', format('aio-{0}', coalesce(tryGet(parameters('advancedConfig'), 'resourceSuffix'), take(uniqueString(resourceGroup().id, parameters('clusterName'), parameters('clusterNamespace')), 5))), 'default', 'default')]",
621691
"extendedLocation": {
622692
"name": "[resourceId('Microsoft.ExtendedLocation/customLocations', parameters('customLocationName'))]",
@@ -650,7 +720,7 @@
650720
},
651721
"dataflow_profile": {
652722
"type": "Microsoft.IoTOperations/instances/dataflowProfiles",
653-
"apiVersion": "2024-11-01",
723+
"apiVersion": "2025-04-01",
654724
"name": "[format('{0}/{1}', format('aio-{0}', coalesce(tryGet(parameters('advancedConfig'), 'resourceSuffix'), take(uniqueString(resourceGroup().id, parameters('clusterName'), parameters('clusterNamespace')), 5))), 'default')]",
655725
"extendedLocation": {
656726
"name": "[resourceId('Microsoft.ExtendedLocation/customLocations', parameters('customLocationName'))]",
@@ -666,7 +736,7 @@
666736
},
667737
"dataflow_endpoint": {
668738
"type": "Microsoft.IoTOperations/instances/dataflowEndpoints",
669-
"apiVersion": "2024-11-01",
739+
"apiVersion": "2025-04-01",
670740
"name": "[format('{0}/{1}', format('aio-{0}', coalesce(tryGet(parameters('advancedConfig'), 'resourceSuffix'), take(uniqueString(resourceGroup().id, parameters('clusterName'), parameters('clusterNamespace')), 5))), 'default')]",
671741
"extendedLocation": {
672742
"name": "[resourceId('Microsoft.ExtendedLocation/customLocations', parameters('customLocationName'))]",
@@ -703,8 +773,7 @@
703773
"version": "[reference('aio_extension').version]",
704774
"releaseTrain": "[reference('aio_extension').releaseTrain]",
705775
"config": {
706-
"brokerListenerName": "[variables('MQTT_SETTINGS').brokerListenerServiceName]",
707-
"brokerListenerPort": "[variables('MQTT_SETTINGS').brokerListenerPort]"
776+
"trustConfig": "[parameters('trustConfig')]"
708777
},
709778
"identityPrincipalId": "[reference('aio_extension', '2023-05-01', 'full').identity.principalId]"
710779
}
@@ -717,7 +786,7 @@
717786
"name": "default",
718787
"listener": "default",
719788
"authn": "default",
720-
"settings": "[variables('BROKER_CONFIG')]"
789+
"settings": "[shallowMerge(createArray(variables('BROKER_CONFIG'), variables('MQTT_SETTINGS')))]"
721790
}
722791
}
723792
},

0 commit comments

Comments
 (0)