bump aks arm api version for addon enablement (#1307)

* bump aks arm api version for addon enablement * fix env var
microsoft · Aug 20, 2024 · 28ef8ee · 28ef8ee
1 parent 39dcad0
commit 28ef8ee
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/kubernetes/ama-logs.yaml b/kubernetes/ama-logs.yaml
@@ -457,8 +457,6 @@ spec:
               value: "false"
             - name: APPMONITORING_OPENTELEMETRYLOGS_PORT
               value: "28331"
-            - name: AZMON_TELEGRAF_LIVENESSPROBE_ENABLED
-              value: "false"
           securityContext:
             privileged: true
             capabilities:
@@ -857,6 +855,8 @@ spec:
               value: "false"
             - name: APPMONITORING_OPENTELEMETRYLOGS_PORT
               value: "28331"
+            - name: AZMON_TELEGRAF_LIVENESSPROBE_ENABLED
+              value: "false"
           securityContext:
             privileged: true
             capabilities:

diff --git a/scripts/onboarding/aks/onboarding-msi-azure-policy/azure-policy.rules.json b/scripts/onboarding/aks/onboarding-msi-azure-policy/azure-policy.rules.json
@@ -266,7 +266,7 @@
 								"type": "Microsoft.ContainerService/managedClusters",
 								"location": "[parameters('aksResourceLocation')]",
 								"tags": "[parameters('resourceTagValues')]",
-								"apiVersion": "2018-03-31",
+								"apiVersion": "2019-04-01",
 								"properties": {
 								  "mode": "Incremental",
 								  "id": "[parameters('aksResourceId')]",

diff --git a/scripts/onboarding/aks/onboarding-msi-bicep-syslog/existingClusterOnboarding.bicep b/scripts/onboarding/aks/onboarding-msi-bicep-syslog/existingClusterOnboarding.bicep
@@ -108,7 +108,7 @@ resource aks_monitoring_msi_dcr 'Microsoft.Insights/dataCollectionRules@2022-06-
   }
 }
 
-resource aks_monitoring_msi_addon 'Microsoft.ContainerService/managedClusters@2018-03-31' = {
+resource aks_monitoring_msi_addon 'Microsoft.ContainerService/managedClusters@2019-04-01' = {
   name: clusterName
   location: aksResourceLocation
   tags: resourceTagValues

diff --git a/scripts/onboarding/aks/onboarding-msi-bicep/existingClusterOnboarding.bicep b/scripts/onboarding/aks/onboarding-msi-bicep/existingClusterOnboarding.bicep
@@ -84,7 +84,7 @@ resource aks_monitoring_msi_dcr 'Microsoft.Insights/dataCollectionRules@2022-06-
   }
 }
 
-resource aks_monitoring_msi_addon 'Microsoft.ContainerService/managedClusters@2018-03-31' = {
+resource aks_monitoring_msi_addon 'Microsoft.ContainerService/managedClusters@2019-04-01' = {
   name: clusterName
   location: aksResourceLocation
   tags: resourceTagValues

diff --git a/scripts/onboarding/aks/onboarding-using-azure-policy/azure-policy.json b/scripts/onboarding/aks/onboarding-using-azure-policy/azure-policy.json
@@ -59,7 +59,7 @@
 													"type": "Microsoft.ContainerService/managedClusters",
 													"location": "[parameters('clusterLocation')]",
 													"tags": "[parameters('clusterTags')]",
-													"apiVersion": "2018-03-31",
+													"apiVersion": "2019-04-01",
 													"properties": {
 														"mode": "Incremental",
 														"id": "[resourceId(parameters('clusterResourceGroupName'), 'Microsoft.ContainerService/managedClusters', parameters('clusterName'))]",

diff --git a/scripts/onboarding/aks/onboarding-using-azure-policy/azurepolicy.rules.json b/scripts/onboarding/aks/onboarding-using-azure-policy/azurepolicy.rules.json
@@ -57,7 +57,7 @@
 												"type": "Microsoft.ContainerService/managedClusters",
 												"location": "[parameters('clusterLocation')]",
 												"tags": "[parameters('clusterTags')]",
-												"apiVersion": "2018-03-31",
+												"apiVersion": "2019-04-01",
 												"properties": {
 													"mode": "Incremental",
 													"id": "[resourceId(parameters('clusterResourceGroupName'), 'Microsoft.ContainerService/managedClusters', parameters('clusterName'))]",

diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json
@@ -465,7 +465,7 @@
                             "type": "Microsoft.ContainerService/managedClusters",
                             "location": "[parameters('aksResourceLocation')]",
                             "tags": "[parameters('resourceTagValues')]",
-                            "apiVersion": "2018-03-31",
+                            "apiVersion": "2019-04-01",
                             "properties": {
                                 "mode": "Incremental",
                                 "id": "[parameters('aksResourceId')]",

diff --git a/test/onboarding-templates-legacy-auth/existingClusterOnboarding.json b/test/onboarding-templates-legacy-auth/existingClusterOnboarding.json
@@ -26,7 +26,7 @@
             "name": "[split(parameters('aksResourceId'),'/')[8]]",
             "type": "Microsoft.ContainerService/managedClusters",
             "location": "[parameters('aksResourceLocation')]",
-            "apiVersion": "2018-03-31",
+            "apiVersion": "2019-04-01",
             "properties": {
                 "mode": "Incremental",
                 "id": "[parameters('aksResourceId')]",