fixed merge issues. (#671) (#672)

* fix merge conflicts

* update with newimage tag

ReleaseNotes.md

@@ -12,8 +12,8 @@ additional questions or comments.
 Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)
 
 ### 10/08/2021 -
-##### Version microsoft/oms:ciprod10082021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10082021 (linux)
-##### Version microsoft/oms:win-ciprod10082021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10082021 (windows)
+##### Version microsoft/oms:ciprod10092021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10092021 (linux)
+##### Version microsoft/oms:win-ciprod10092021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10092021 (windows)
 ##### Code change log
 - Linux Agent
   - MDSD Proxy support for non-AKS

kubernetes/linux/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 MAINTAINER [email protected]
 LABEL vendor=Microsoft\ Corp \
     com.microsoft.product="Azure Monitor for containers"
-ARG IMAGE_TAG=ciprod10082021
+ARG IMAGE_TAG=ciprod10092021
 ENV AGENT_VERSION ${IMAGE_TAG}
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi

kubernetes/omsagent.yaml

@@ -368,7 +368,7 @@ spec:
             value: "3"
       containers:
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10082021"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10092021"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -603,7 +603,7 @@ spec:
       serviceAccountName: omsagent
       containers:
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10082021"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10092021"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -776,7 +776,7 @@ spec:
             value: "3"
      containers:
        - name: omsagent-win
-         image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10082021"
+         image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10092021"
          imagePullPolicy: IfNotPresent
          resources:
           limits:

kubernetes/windows/Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER [email protected]
 LABEL vendor=Microsoft\ Corp \
     com.microsoft.product="Azure Monitor for containers"
 
-ARG IMAGE_TAG=win-ciprod10082021
+ARG IMAGE_TAG=win-ciprod10092021
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement