Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ powershell -ExecutionPolicy bypass # switch to powershell if you are not on pow

# Azure DevOps Build Pipeline

Navigate to https://github-private.visualstudio.com/microsoft/_build?view=pipelines to see Linux and Windows Agent build pipelines. These pipelines are configured with CI triggers for ci_dev and ci_prod (TBD).
Navigate to https://github-private.visualstudio.com/microsoft/_build?view=pipelines to see Linux and Windows Agent build pipelines. These pipelines are configured with CI triggers for ci_dev and ci_prod.

Docker Images will be pushed to CDPX ACR repos and these needs to retagged and pushed to corresponding ACR or docker hub. Only onboarded Azure AD AppId has permission to pull the images from CDPx ACRs.

Expand All @@ -236,7 +236,7 @@ Here are the instructions to onboard the feature branch to Azure Dev Ops pipelin

# Azure DevOps Release Pipeline

Integrated to Azure DevOps release pipeline for the ci_dev and ci_prod (TBD).With this, for every commit to ci_dev branch, latest bits automatically deployded to DEV AKS clusters in Build subscription and similarly for for every commit to ci_prod branch, latest bits automatically deployed to PROD AKS clusters in Build subscription.
Integrated to Azure DevOps release pipeline for the ci_dev and ci_prod.With this, for every commit to ci_dev branch, latest bits automatically deployded to DEV AKS clusters in Build subscription and similarly for for every commit to ci_prod branch, latest bits automatically deployed to PROD AKS clusters in Build subscription.

For dev, agent image will be in this format mcr.microsoft.com/azuremonitor/containerinsights/cidev:cidev<git-commit-id>.
For prod, agent will be in this format mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod`<MM><DD><YYYY>`.
Expand Down
16 changes: 16 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,22 @@ additional questions or comments.

Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)

### 08/05/2020 -
##### Version microsoft/oms:ciprod08052020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052020 (linux)
##### Version microsoft/oms:win-ciprod08052020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08052020 (windows)
##### Code change log
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

few more -

  • Bug fix for showing node as 'not ready' when there is disk pressure
  • oneagent integration (disabled by default)
  • Add region check before sending alertable metrics to MDM
  • Telemetry fix for agent telemetry for sov. clouds

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Bug fix for showing node as 'not ready' when there is disk pressure
  • oneagent integration (disabled by default)
  • Add region check before sending alertable metrics to MDM
  • Telemetry fix for agent telemetry for sov. clouds

Fixed.

- Collection of KubeState metrics for deployments and HPA
- Add the Proxy support for Windows agent
- Fix for ContainerState in ContainerInventory to handle Failed state and collection of environment variables for terminated and failed containers
- Change /spec to /metrics/cadvisor endpoint to collect node capacity metrics
- Disable Health Plugin by default and can enabled via configmap
- Pin version of jq to 1.5+dfsg-2
- Bug fix for showing node as 'not ready' when there is disk pressure
- oneagent integration (disabled by default)
- Add region check before sending alertable metrics to MDM
- Telemetry fix for agent telemetry for sov. clouds


### 07/15/2020 -
##### Version microsoft/oms:ciprod07152020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod07152020 (linux)
##### Version microsoft/oms:win-ciprod05262020-2 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod05262020-2 (windows)
Expand Down
16 changes: 11 additions & 5 deletions ReleaseProcess.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@
Here are the high-level instructions to get the CIPROD`<MM><DD><YYYY>` image for the production release
1. create feature branch from ci_dev and make the following updates
> Note: This required since Azure Dev Ops pipeline doesnt support --build-arg yet to automate this.
- Ensure IMAGE_TAG updated with release candiate image tag in the DockerFile under kubernetes/linux and kubernetes/windows directory
- Update omsagent.yaml if there are any changes to the yaml
- Ensure IMAGE_TAG updated with release candiate image tag in the DockerFile under kubernetes/linux and kubernetes/windows directory
- Update the version file under build directory with build version and date
- Update omsagent.yaml for the image tag and dockerProviderVersion, and any other changes
- Update the chart version and image tags in values.yaml under charts/azuremonitor-containers
- Release notes
2. Make PR to ci_dev branch and once the PR approved, merge the changes to ci_dev
3. Latest bits of ci_dev automatically deployed to CIDEV cluster in build subscription so just validated E2E to make sure everthing works
4. If everything validated in DEV, make merge PR from ci_dev and ci_prod and merge once this reviewed by dev team
5. Merge ci_dev and ci_prod branch which will trigger automatic deployment of latest bits to CIPROD cluster with CIPROD`<MM><DD><YYYY>` image (TBD)
6. Update following pipeline variables under ReleaseCandiate with version of chart and image tag
- CIHELMCHARTVERSION <VersionValue> # For example, 2.7.4
- CIImageTagSuffix <ImageTag> # ciprod08052020 or ciprod08052020-1 etc.
7. Merge ci_dev and ci_prod branch which will trigger automatic deployment of latest bits to CIPROD cluster with CIPROD`<MM><DD><YYYY>` image to test and scale cluters, AKS, AKS-Engine
> Note: production image automatically pushed to CIPROD Public cloud ACR which will inturn replicated to Public cloud MCR.
6. Validate all the scenarios against CIPROD cluster in Build subscription
8. Validate all the scenarios against clusters in build subscription and scale clusters


# 2. Perf and scale testing

Expand All @@ -27,7 +33,7 @@ Image automatically synched to MCR CN from Public cloud MCR.

## AKS

Make PR against [AKS-RP](https://msazure.visualstudio.com/CloudNativeCompute/_git/aks-rp?version=GBmaster) repo with chart update(s)
- Refer to internal docs for the release process and instructions.

## ARO v3

Expand Down
4 changes: 2 additions & 2 deletions build/version
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
CONTAINER_BUILDVERSION_MAJOR=10
CONTAINER_BUILDVERSION_MINOR=0
CONTAINER_BUILDVERSION_PATCH=0
CONTAINER_BUILDVERSION_BUILDNR=1
CONTAINER_BUILDVERSION_DATE=20200526
CONTAINER_BUILDVERSION_BUILDNR=4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why bump from 1 to 4 ? due to 2 hotfixes ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why bump from 1 to 4 ? due to 2 hotfixes ?

That's right.

CONTAINER_BUILDVERSION_DATE=20200805
CONTAINER_BUILDVERSION_STATUS=Developer_Build

#-------------------------------- End of File -----------------------------------
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3
version: 2.7.4
kubeVersion: "^1.10.0-0"
keywords:
- monitoring
Expand Down
6 changes: 3 additions & 3 deletions charts/azuremonitor-containers/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
omsagent:
image:
repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
tag: "ciprod07152020"
tagWindows: "win-ciprod05262020-2"
tag: "ciprod08052020"
tagWindows: "win-ciprod08052020"
pullPolicy: IfNotPresent
dockerProviderVersion: "10.0.0-3"
dockerProviderVersion: "10.0.0-4"
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.
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=ciprod07152020
ARG IMAGE_TAG=ciprod08052020
ENV AGENT_VERSION ${IMAGE_TAG}
ENV tmpdir /opt
ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi
Expand Down
12 changes: 6 additions & 6 deletions kubernetes/omsagent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@ spec:
tier: node
annotations:
agentVersion: "1.10.0.1"
dockerProviderVersion: "10.0.0-3"
dockerProviderVersion: "10.0.0-4"
schema-versions: "v1"
spec:
serviceAccountName: omsagent
containers:
- name: omsagent
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod07152020"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052020"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -480,13 +480,13 @@ spec:
rsName: "omsagent-rs"
annotations:
agentVersion: "1.10.0.1"
dockerProviderVersion: "10.0.0-3"
dockerProviderVersion: "10.0.0-4"
schema-versions: "v1"
spec:
serviceAccountName: omsagent
containers:
- name: omsagent
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod07152020"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052020"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -631,13 +631,13 @@ spec:
tier: node-win
annotations:
agentVersion: "1.10.0.1"
dockerProviderVersion: "10.0.0-2"
dockerProviderVersion: "10.0.0-4"
schema-versions: "v1"
spec:
serviceAccountName: omsagent
containers:
- name: omsagent-win
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod05262020-2"
image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08052020"
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MAINTAINER OMSContainers@microsoft.com
LABEL vendor=Microsoft\ Corp \
com.microsoft.product="Azure Monitor for containers"

ARG IMAGE_TAG=win-ciprod05262020-2
ARG IMAGE_TAG=win-ciprod08052020

SHELL ["powershell"]

Expand Down