diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml index 8376f146c7..b29d86e41f 100644 --- a/incubator/azuremonitor-containers/Chart.yaml +++ b/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.3.0 +version: 2.4.0 kubeVersion: "^1.10.0-0" keywords: - monitoring diff --git a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml index aff3d2b648..c76730aeb8 100644 --- a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml +++ b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml @@ -89,12 +89,14 @@ spec: periodSeconds: 60 nodeSelector: beta.kubernetes.io/os: linux - # Tolerate a NoSchedule taint on master that ACS Engine sets. + # Tolerate below taints on nodes of k8s clusters to schedule ds pod. tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Equal" - value: "true" - effect: "NoSchedule" + - operator: "Exists" + effect: "NoSchedule" + - operator: "Exists" + effect: "NoExecute" + - operator: "Exists" + effect: "PreferNoSchedule" volumes: - name: host-root hostPath: diff --git a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml index 377050b242..77054ce2d0 100644 --- a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml +++ b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml @@ -83,7 +83,6 @@ spec: periodSeconds: 60 nodeSelector: beta.kubernetes.io/os: linux - kubernetes.io/role: agent volumes: - name: docker-sock hostPath: diff --git a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml index ab2911902c..6a446e061e 100644 --- a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml +++ b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml @@ -22,7 +22,7 @@ rules: resources: ["pods", "events", "nodes", "namespaces", "services"] verbs: ["list", "get", "watch"] - apiGroups: ["extensions"] - resources: ["deployments"] + resources: ["replicasets"] verbs: ["list"] - apiGroups: ["azmon.container.insights"] resources: ["healthstates"] diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml index f92785d768..bd3733d0b7 100644 --- a/incubator/azuremonitor-containers/values.yaml +++ b/incubator/azuremonitor-containers/values.yaml @@ -6,9 +6,9 @@ ## ref: https://github.com/Microsoft/OMS-docker/tree/ci_feature_prod omsagent: image: - tag: "ciprod10182019" + tag: "ciprod11012019" pullPolicy: IfNotPresent - dockerProviderVersion: "7.0.0-5" + dockerProviderVersion: "7.0.0-6" 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.