From 16b972398e0106085fb2124146d3bae661929558 Mon Sep 17 00:00:00 2001 From: Grace Wehner Date: Tue, 26 Sep 2023 09:00:06 -0700 Subject: [PATCH] Arc extension fixes (#605) --- .../ServiceGroupRoot/Scripts/arcExtensionRelease.sh | 2 +- otelcollector/VERSION | 2 +- .../templates/ama-metrics-daemonset.yaml | 4 ++-- .../templates/ama-metrics-deployment.yaml | 4 ++-- .../azure-monitor-metrics-addon/values-template.yaml | 5 +++++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.pipelines/deployment/arc-extension-release/ServiceGroupRoot/Scripts/arcExtensionRelease.sh b/.pipelines/deployment/arc-extension-release/ServiceGroupRoot/Scripts/arcExtensionRelease.sh index 6797a2504..575523dcc 100644 --- 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 index c56facf89..2ed16f40d 100644 --- a/otelcollector/VERSION +++ b/otelcollector/VERSION @@ -1 +1 @@ -6.7.5 +6.7.6 diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml index ed3305915..6e5769bcf 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml +++ b/otelcollector/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/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-deployment.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-deployment.yaml index 1bf13e861..532f5c930 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-deployment.yaml +++ b/otelcollector/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 index ce0f47f81..e9cfcef4e 100644 --- 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 +