chore: updates amacoreagent

Signed-off-by: Nilekh Chaudhari <1626598+nilekhc@users.noreply.github.com>
Azure · Nov 16, 2023 · 3716801 · 3716801
1 parent b502857
commit 3716801
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/.pipelines/templates/arc/e2e-extension-test.yaml b/.pipelines/templates/arc/e2e-extension-test.yaml
@@ -57,10 +57,10 @@ jobs:
           ciKindCluster: true
           isArcTest: true
       - template: ../teardown.yaml
-      - template: ../cleanup-images.yaml
-        parameters:
-          imageVersion: $(EXT_VERSION)
-          registryRepo: $(REGISTRY_REPO)
-          subscriptionId: $(SUBSCRIPTION_ID)
-          registryName: $(STAGING_REGISTRY_NAME)
-          isMultiArch: false
+      # - template: ../cleanup-images.yaml
+      #   parameters:
+      #     imageVersion: $(EXT_VERSION)
+      #     registryRepo: $(REGISTRY_REPO)
+      #     subscriptionId: $(SUBSCRIPTION_ID)
+      #     registryName: $(STAGING_REGISTRY_NAME)
+      #     isMultiArch: false
diff --git a/manifest_staging/charts/csi-secrets-store-provider-azure/config/gcstenant-conf.json b/manifest_staging/charts/csi-secrets-store-provider-azure/config/gcstenant-conf.json
@@ -8,14 +8,16 @@
         "GcsEnvironment": "DiagnosticsPROD",
         "GcsGenevaAccount": "akvsecretsprovider",
         "GcsNamespace": "akvsecretsprovider",
-        "GenevaConfigVersion": "1.0",
+        "GenevaConfigVersion": "2.2",
         "GcsRegion": "westus2"
     },
     "EndpointConfigurations": [
         {
             "EndpointPath": "",
             "EndpointPort": 15000,
-            "EndpointOtlp": "localhost:4319"
+            "EndpointOtlp": "localhost:4317",
+            "EndpointOtlpReceiver": "localhost:4318",
+            "EnableOtlpClientValidation": false
         }
     ]
 }
diff --git a/manifest_staging/charts/csi-secrets-store-provider-azure/templates/arc-monitoring.yaml b/manifest_staging/charts/csi-secrets-store-provider-azure/templates/arc-monitoring.yaml
@@ -40,7 +40,7 @@ spec:
               memory: 100Mi
         # MDM
         - name: mdm
-          image: "linuxgeneva-microsoft.azurecr.io/genevamdm:master_20220401.1"
+          image: "linuxgeneva-microsoft.azurecr.io/distroless/genevamdm:2.2023.1027.1417-08a588-20231027t1613"
           imagePullPolicy: IfNotPresent
           env: 
           - name: ROLEINSTANCE
@@ -113,7 +113,7 @@ spec:
               subPath: telegraf.conf
         # Pipeline agent for logging
         - name: amacoreagent
-          image: "pipelineagent.azurecr.io/amacoreagent:3.0"
+          image: "linuxgeneva-microsoft.azurecr.io/amacoreagentaot:1.2.47"
           imagePullPolicy: IfNotPresent
           resources:
             requests:
@@ -123,6 +123,10 @@ spec:
               cpu: 50m
               memory: 100Mi
           env:
+          - name: MONITORING_USE_GENEVA_CONFIG_SERVICE
+            value: "true"
+          - name: SKIP_IMDS_LOOKUP_FOR_LEGACY_AUTH
+            value: "1"
           - name: MONITORING_GCS_AUTH_ID_TYPE
             value: AuthMSIToken
           - name: PA_TENANTS_DIR
@@ -164,7 +168,7 @@ spec:
           - name: MONITORING_GCS_NAMESPACE
             value: "akvsecretsprovider"
           - name: MONITORING_CONFIG_VERSION
-            value: "1.0"
+            value: "2.2"
           - name: MDSD_CONFIG_DIR
             value: /tmp
           - name: DOCKER_LOGGING
@@ -178,7 +182,7 @@ spec:
               mountPath: /var/run/mdsd
         # FluentD
         - name: fluentd
-          image: "linuxgeneva-microsoft.azurecr.io/genevafluentd_td-agent:master_20220403.1"
+          image: "linuxgeneva-microsoft.azurecr.io/distroless/genevafluentd_td-agent:mariner_20230915.3"
           imagePullPolicy: IfNotPresent
           resources:
             requests: