From 71b2272ba4e3e1ee14ddafd0efe9a8019f3ad694 Mon Sep 17 00:00:00 2001
From: Ganga Mahesh Siddem <gangams@microsoft.com>
Date: Wed, 8 Jul 2020 13:40:35 -0700
Subject: [PATCH] update to linux agent ciprod06302020 and add the tolerations
 for windows (#23099)

Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com>
---
 incubator/azuremonitor-containers/Chart.yaml                  | 2 +-
 .../templates/omsagent-daemonset-windows.yaml                 | 3 +++
 incubator/azuremonitor-containers/values.yaml                 | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
index 4be3050cb0..d815c2017f 100644
--- a/incubator/azuremonitor-containers/Chart.yaml
+++ b/incubator/azuremonitor-containers/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 7.0.0-1
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 2.7.1
+version: 2.7.2
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring
diff --git a/incubator/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml b/incubator/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
index 56755963e1..2874a1e952 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
@@ -76,6 +76,9 @@ spec:
    {{- with .Values.omsagent.daemonsetwindows.affinity }}
    affinity: {{- toYaml . | nindent 8 }}
    {{- end }}
+   {{- with .Values.omsagent.tolerations }}
+   tolerations: {{- toYaml . | nindent 8 }}
+   {{- end }}
    volumes:
     - name: docker-windows-kuberenetes-container-logs
       hostPath:
diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml
index d243e8c7fd..865d4e3557 100644
--- a/incubator/azuremonitor-containers/values.yaml
+++ b/incubator/azuremonitor-containers/values.yaml
@@ -7,10 +7,10 @@
 omsagent:
   image:
     repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
-    tag: "ciprod05262020"
+    tag: "ciprod06302020"
     tagWindows: "win-ciprod05262020-2"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "10.0.0-1"
+    dockerProviderVersion: "10.0.0-2"
     agentVersion: "1.10.0.1"
   ## To get your workspace id and key do the following
   ## You can create a Azure Loganalytics workspace from portal.azure.com and get its ID & PRIMARY KEY from 'Advanced Settings' tab in the Ux.