Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed merge issues. (#671) #672

Merged
merged 1 commit into from
Oct 11, 2021
Merged

fixed merge issues. (#671) #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions kubernetes/omsagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down