add support for container runtimes and openshift v4 (#22034)

Signed-off-by: Ganga Mahesh Siddem <gangams@microsoft.com>

incubator/azuremonitor-containers/Chart.yaml

@@ -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.6.1
+version: 2.7.0
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring
@@ -18,6 +18,8 @@ keywords:
   - acs-engine
   - aks-engine
   - azurestack
+  - openshift v4
+  - azure redhat openshift v4
   - on-prem kubernetes monitoring
   - containerlogs
   - containerhealth

incubator/azuremonitor-containers/README.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes environments.
+This article describes how to set up and use [Azure Monitor - Containers](https://docs.microsoft.com/en-us/azure/monitoring/monitoring-container-health) to monitor the health and performance of your workloads deployed to Kubernetes and OpenShift v4 environments.
 
 Monitoring your Kubernetes cluster and containers is critical, especially when running a production cluster, at scale, with multiple applications.
 
@@ -123,4 +123,7 @@ If you need help with this chart, please reach us out through [this](mailto:askc
 
 ## Custom resource
 
-Starting with chart version 2.0.0, chart will create a CRD (healthstates.azmon.container.insights) in kube-system namespace. This is used by the agent for cluster health monitoring.
+Starting with chart version 2.0.0, chart will create a CRD (healthstates.azmon.container.insights) in kube-system namespace. This is used by the agent for cluster health monitoring.
+## Container Runtime(s)
+
+Starting with chart version 2.7.0, chart will support Container Runtime Interface(CRI) compatiable runtimes such as CRI-O and ContainerD etc. in addition to Docker/Moby.

incubator/azuremonitor-containers/templates/omsagent-rbac.yaml

@@ -19,7 +19,7 @@ metadata:
     heritage: {{ .Release.Service }}
 rules:
 - apiGroups: [""]
-  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "namespaces", "services"]
+  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services"]
   verbs: ["list", "get", "watch"]
 - apiGroups: ["apps", "extensions"]
   resources: ["replicasets"]

incubator/azuremonitor-containers/values.yaml

@@ -6,9 +6,9 @@
 ## ref: https://github.com/Microsoft/OMS-docker/tree/ci_feature_prod
 omsagent:
   image:
-    tag: "ciprod03022020"
+    tag: "ciprod04162020"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "8.0.0-3"
+    dockerProviderVersion: "9.0.0-1"
     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.