Arc extension fixes (#605)

Azure · Sep 26, 2023 · 16b9723 · 16b9723
1 parent 5664fd4
commit 16b9723
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.pipelines/deployment/arc-extension-release/ServiceGroupRoot/Scripts/arcExtensionRelease.sh b/.pipelines/deployment/arc-extension-release/ServiceGroupRoot/Scripts/arcExtensionRelease.sh
@@ -21,7 +21,7 @@ LARGE_REGION="$MEDIUM_REGION,\"eastus\""
 BATCH_1_REGIONS="$LARGE_REGION,\"westus2\",\"southcentralus\",\"southeastasia\",\"koreacentral\",\"centralus\",\"japaneast\",\"australiaeast\""
 BATCH_2_REGIONS="$BATCH_1_REGIONS,\"northeurope\",\"uksouth\",\"francecentral\",\"westus\",\"northcentralus\",\"eastasia\",\"westus3\",\"usgovvirginia\""
 BATCH_3_REGIONS="$BATCH_2_REGIONS,\"westeurope\",\"canadacentral\",\"canadaeast\",\"australiasoutheast\",\"centralindia\",\"switzerlandnorth\",\"germanywestcentral\",\"norwayeast\",\"germanynorth\""
-BATCH_4_REGIONS="$BATCH_3_REGIONS,\"japanwest\",\"ukwest\",\"koreasouth\",\"southafricanorth\",\"southindia\",\"brazilsouth\",\"uaenorth\",\"norwaywest\""
+BATCH_4_REGIONS="$BATCH_3_REGIONS,\"japanwest\",\"ukwest\",\"koreasouth\",\"southafricanorth\",\"southindia\",\"brazilsouth\",\"uaenorth\",\"norwaywest\",\"swedensouth\""
 
 RELEASE_TRAIN_PIPELINE="\"pipeline\""
 RELEASE_TRAIN_STAGING="$RELEASE_TRAIN_PIPELINE,\"staging\""

diff --git a/otelcollector/VERSION b/otelcollector/VERSION
@@ -1 +1 @@
-6.7.5
+6.7.6
diff --git a/...ector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml b/...ector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml
@@ -149,7 +149,7 @@ spec:
             - mountPath: /anchors/mariner
               name: anchors-mariner
               readOnly: true
-            {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s")) }}
+            {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (not (hasPrefix "aks_edge" .Values.ClusterDistribution )) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s"))) }}
             - mountPath: /anchors/ubuntu
               name: anchors-ubuntu
               readOnly: true
@@ -262,7 +262,7 @@ spec:
           hostPath:
             path: /etc/pki/ca-trust/anchors/
             type: DirectoryOrCreate
-        {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s")) }}
+        {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (not (hasPrefix "aks_edge" .Values.ClusterDistribution )) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s"))) }}
         - name: anchors-ubuntu
           hostPath:
             path: /usr/local/share/ca-certificates/

diff --git a/...ctor/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-deployment.yaml b/...ctor/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-deployment.yaml
@@ -160,7 +160,7 @@ spec:
             - mountPath: /anchors/mariner
               name: anchors-mariner
               readOnly: true
-            {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s")) }}
+            {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (not (hasPrefix "aks_edge" .Values.ClusterDistribution )) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s"))) }}
             - mountPath: /anchors/ubuntu
               name: anchors-ubuntu
               readOnly: true
@@ -289,7 +289,7 @@ spec:
           hostPath:
             path: /etc/pki/ca-trust/anchors/
             type: DirectoryOrCreate
-        {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s")) }}
+        {{- if or (ne .Values.AzureMonitorMetrics.ArcExtension true) (and (not (hasPrefix "aks_edge" .Values.ClusterDistribution )) (and (ne .Values.Azure.Cluster.Distribution "aks_edge_k3s") (ne .Values.Azure.Cluster.Distribution "aks_edge_k8s"))) }}
         - name: anchors-ubuntu
           hostPath:
             path: /usr/local/share/ca-certificates/

diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml
@@ -112,7 +112,12 @@ Azure:
           requests:
             cpu: 20m
             memory: 50Mi
+ClusterDistribution: ""
 prometheus-node-exporter:
   service:
     port: 9110
     targetPort: 9110
+  image:
+    registry: mcr.microsoft.com
+    repository: oss/prometheus/node-exporter
+