From 82cbdc7ee1a637d23674531c8c1cf13a9715073a Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Fri, 8 Oct 2021 18:42:52 -0700 Subject: [PATCH] fixed merge issues. (#671) * fix merge conflicts * update with newimage tag --- ReleaseNotes.md | 4 ++-- kubernetes/linux/Dockerfile | 2 +- kubernetes/omsagent.yaml | 6 +++--- kubernetes/windows/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 0fd0f7948..98b1ef3ce 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -12,8 +12,8 @@ additional questions or comments. Note : The agent version(s) below has dates (ciprod), 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 diff --git a/kubernetes/linux/Dockerfile b/kubernetes/linux/Dockerfile index fd408b9b2..c3f952d4e 100644 --- a/kubernetes/linux/Dockerfile +++ b/kubernetes/linux/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:18.04 MAINTAINER OMSContainers@microsoft.com 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 diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index 97e32c0e1..e7b632d04 100644 --- a/kubernetes/omsagent.yaml +++ b/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: diff --git a/kubernetes/windows/Dockerfile b/kubernetes/windows/Dockerfile index 76667f389..0e6591e3f 100644 --- a/kubernetes/windows/Dockerfile +++ b/kubernetes/windows/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER OMSContainers@microsoft.com 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