From 1a9346c7ae7f8765acf416f059d72c07c24656e5 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Thu, 20 May 2021 12:27:56 -0700 Subject: [PATCH 1/2] changes for 05202021 release --- ReleaseNotes.md | 8 +++++++- build/version | 2 +- kubernetes/linux/Dockerfile | 2 +- kubernetes/omsagent.yaml | 10 +++++----- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index b4c0d6ba4..5eb5e2c1d 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -11,9 +11,15 @@ additional questions or comments. Note : The agent version(s) below has dates (ciprod), which indicate the agent build dates (not release dates) +### 05/20/2021 - +##### Version microsoft/oms:ciprod0520021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021 (linux) +##### No Windows changes with this release, win-ciprod04222021 still current. +##### Code change log +- Telegraf now waits 30 seconds on startup for network connections to complete (Linux only) +- Change adding telegraf to the liveness probe reverted (Linux only) ### 05/12/2021 - -##### Version microsoft/oms:ciprod00512021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021 (linux) +##### Version microsoft/oms:ciprod0512021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021 (linux) ##### No Windows changes with this release, win-ciprod04222021 still current. ##### Code change log - Upgrading oneagent to version 1.8 (only for Linux) diff --git a/build/version b/build/version index 81bb808f5..d70d1f9bc 100644 --- a/build/version +++ b/build/version @@ -3,7 +3,7 @@ # Build Version Information CONTAINER_BUILDVERSION_MAJOR=15 -CONTAINER_BUILDVERSION_MINOR=1 +CONTAINER_BUILDVERSION_MINOR=2 CONTAINER_BUILDVERSION_PATCH=0 CONTAINER_BUILDVERSION_BUILDNR=0 CONTAINER_BUILDVERSION_DATE=20210512 diff --git a/kubernetes/linux/Dockerfile b/kubernetes/linux/Dockerfile index 822e52bc8..3ad3cd315 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=ciprod05122021 +ARG IMAGE_TAG=ciprod05202021 ENV AGENT_VERSION ${IMAGE_TAG} ENV tmpdir /opt ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi diff --git a/kubernetes/omsagent.yaml b/kubernetes/omsagent.yaml index bf94490ba..6ff02c941 100644 --- a/kubernetes/omsagent.yaml +++ b/kubernetes/omsagent.yaml @@ -358,7 +358,7 @@ spec: tier: node annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.1.0-0" + dockerProviderVersion: "15.2.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent @@ -368,7 +368,7 @@ spec: value: "3" containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021" imagePullPolicy: IfNotPresent resources: limits: @@ -446,7 +446,7 @@ spec: timeoutSeconds: 15 #Only in sidecar scraping mode - name: omsagent-prometheus - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021" imagePullPolicy: IfNotPresent resources: limits: @@ -583,13 +583,13 @@ spec: rsName: "omsagent-rs" annotations: agentVersion: "1.10.0.1" - dockerProviderVersion: "15.1.0-0" + dockerProviderVersion: "15.2.0-0" schema-versions: "v1" spec: serviceAccountName: omsagent containers: - name: omsagent - image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021" + image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021" imagePullPolicy: IfNotPresent resources: limits: From 5a27907543f50ab443aa0442b6c48f685f7e2e29 Mon Sep 17 00:00:00 2001 From: David Michelman Date: Thu, 20 May 2021 12:39:12 -0700 Subject: [PATCH 2/2] fixed typos --- ReleaseNotes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 5eb5e2c1d..d7d6de6af 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -12,14 +12,14 @@ additional questions or comments. Note : The agent version(s) below has dates (ciprod), which indicate the agent build dates (not release dates) ### 05/20/2021 - -##### Version microsoft/oms:ciprod0520021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021 (linux) +##### Version microsoft/oms:ciprod05202021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05202021 (linux) ##### No Windows changes with this release, win-ciprod04222021 still current. ##### Code change log - Telegraf now waits 30 seconds on startup for network connections to complete (Linux only) - Change adding telegraf to the liveness probe reverted (Linux only) ### 05/12/2021 - -##### Version microsoft/oms:ciprod0512021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021 (linux) +##### Version microsoft/oms:ciprod05122021 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod05122021 (linux) ##### No Windows changes with this release, win-ciprod04222021 still current. ##### Code change log - Upgrading oneagent to version 1.8 (only for Linux)