From 1ac817935aadd88dceebf17f53395f6e2f564d60 Mon Sep 17 00:00:00 2001 From: Kaveesh Dubey Date: Thu, 26 Oct 2023 09:52:03 -0700 Subject: [PATCH] trivy --- .trivyignore | 3 ++- .../addon-chart/azure-monitor-metrics-addon/Chart.yaml | 4 ++-- .../addon-chart/azure-monitor-metrics-addon/values.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.trivyignore b/.trivyignore index 455e620b4..ea750603a 100644 --- a/.trivyignore +++ b/.trivyignore @@ -16,4 +16,5 @@ CVE-2023-40577 # MEDIUM - go vulnerabilities CVE-2023-39325 CVE-2023-3978 -CVE-2023-44487 \ No newline at end of file +CVE-2023-44487 +GHSA-m425-mq94-257g \ No newline at end of file diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml index 0dd6c0b2e..aa7403b76 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 6.8.0-ccp-shell-removal-branch-10-25-2023-de1a5fb5 +version: 6.8.0-ccp-shell-removal-branch-10-26-2023-3703fa73 # This is the version number of the application being deployed (basically, imagetag for the image built/compatible with this chart semver above). This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "6.8.0-ccp-shell-removal-branch-10-25-2023-de1a5fb5" +appVersion: "6.8.0-ccp-shell-removal-branch-10-26-2023-3703fa73" # dependencies: # - name: prometheus-node-exporter # version: "4.21.0" diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml index 36b670478..4cf8c56ab 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml @@ -36,10 +36,10 @@ AzureMonitorMetrics: - validatingwebhookconfigurations - volumeattachments ImageRepository: "/azuremonitor/containerinsights/cidev/prometheus-collector/images" - ImageTag: "6.8.0-ccp-shell-removal-branch-10-25-2023-de1a5fb5" - ImageTagWin: "6.8.0-ccp-shell-removal-branch-10-25-2023-de1a5fb5-win" - ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-10-25-2023-de1a5fb5-targetallocator" - ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-10-25-2023-de1a5fb5-cfg" + ImageTag: "6.8.0-ccp-shell-removal-branch-10-26-2023-3703fa73" + ImageTagWin: "6.8.0-ccp-shell-removal-branch-10-26-2023-3703fa73-win" + ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-10-26-2023-3703fa73-targetallocator" + ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-10-26-2023-3703fa73-cfg" TargetAllocatorEnabled: false DeploymentReplicas: 1 # The below 2 settings are not Azure Monitor Metrics adapter chart. They are substituted in a different manner.