diff --git a/parts/k8s/containeraddons/1.16/kubernetesmasteraddons-omsagent-daemonset.yaml b/parts/k8s/containeraddons/1.16/kubernetesmasteraddons-omsagent-daemonset.yaml
index e4ba0b73ac..c54c181b16 100644
--- a/parts/k8s/containeraddons/1.16/kubernetesmasteraddons-omsagent-daemonset.yaml
+++ b/parts/k8s/containeraddons/1.16/kubernetesmasteraddons-omsagent-daemonset.yaml
@@ -33,7 +33,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"]
@@ -295,7 +295,6 @@ data:
max_retry_wait 9m
retry_mdm_post_wait_minutes 60
-
type out_oms
log_level debug
diff --git a/parts/k8s/containeraddons/1.17/kubernetesmasteraddons-omsagent-daemonset.yaml b/parts/k8s/containeraddons/1.17/kubernetesmasteraddons-omsagent-daemonset.yaml
index a525c51b3e..335ba7acac 100644
--- a/parts/k8s/containeraddons/1.17/kubernetesmasteraddons-omsagent-daemonset.yaml
+++ b/parts/k8s/containeraddons/1.17/kubernetesmasteraddons-omsagent-daemonset.yaml
@@ -33,7 +33,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"]
@@ -236,7 +236,7 @@ data:
max_retry_wait 9m
-
+
type out_oms
log_level debug
num_threads 5
diff --git a/parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml b/parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml
index 1f4f24489a..d44aa4ac3e 100644
--- a/parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml
+++ b/parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml
@@ -33,7 +33,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/pkg/api/addons.go b/pkg/api/addons.go
index cb1440de19..22af27b5c3 100644
--- a/pkg/api/addons.go
+++ b/pkg/api/addons.go
@@ -24,18 +24,18 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
cloudSpecConfig := cs.GetCloudSpecConfig()
k8sComponents := K8sComponentsByVersionMap[o.OrchestratorVersion]
specConfig := cloudSpecConfig.KubernetesSpecConfig
- omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019"
+ omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019"
var workspaceDomain string
if cs.Properties.IsAzureStackCloud() {
dependenciesLocation := string(cs.Properties.CustomCloudProfile.DependenciesLocation)
workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(dependenciesLocation)
if strings.EqualFold(dependenciesLocation, "china") {
- omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod10182019"
+ omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod11012019"
}
} else {
workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(cloudSpecConfig.CloudName)
if strings.EqualFold(cloudSpecConfig.CloudName, "AzureChinaCloud") {
- omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod10182019"
+ omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod11012019"
}
}
workspaceDomain = base64.StdEncoding.EncodeToString([]byte(workspaceDomain))
@@ -267,7 +267,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
Enabled: to.BoolPtr(DefaultContainerMonitoringAddonEnabled && !cs.Properties.IsAzureStackCloud()),
Config: map[string]string{
"omsAgentVersion": "1.10.0.1",
- "dockerProviderVersion": "7.0.0-5",
+ "dockerProviderVersion": "7.0.0-6",
"schema-versions": "v1",
"clusterName": clusterDNSPrefix,
"workspaceDomain": workspaceDomain,
diff --git a/pkg/api/addons_test.go b/pkg/api/addons_test.go
index 3d3e861185..6c89c9f37e 100644
--- a/pkg/api/addons_test.go
+++ b/pkg/api/addons_test.go
@@ -4079,7 +4079,7 @@ func TestSetAddonsConfig(t *testing.T) {
Enabled: to.BoolPtr(true),
Config: map[string]string{
"omsAgentVersion": "1.10.0.1",
- "dockerProviderVersion": "7.0.0-5",
+ "dockerProviderVersion": "7.0.0-6",
"schema-versions": "v1",
"clusterName": "aks-engine-cluster",
"workspaceDomain": "b3BpbnNpZ2h0cy5henVyZS5jb20=",
@@ -4091,7 +4091,7 @@ func TestSetAddonsConfig(t *testing.T) {
MemoryRequests: "250Mi",
CPULimits: "150m",
MemoryLimits: "600Mi",
- Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
+ Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019",
},
},
},
diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go
index b410cf800a..036f5359a6 100644
--- a/pkg/api/defaults_test.go
+++ b/pkg/api/defaults_test.go
@@ -206,7 +206,7 @@ func TestAssignDefaultAddonImages(t *testing.T) {
ReschedulerAddonName: "k8s.gcr.io/rescheduler:v0.4.0",
MetricsServerAddonName: "k8s.gcr.io/metrics-server-amd64:v0.2.1",
NVIDIADevicePluginAddonName: "nvidia/k8s-device-plugin:1.11",
- ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
+ ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019",
IPMASQAgentAddonName: "k8s.gcr.io/ip-masq-agent-amd64:v2.5.0",
AzureCNINetworkMonitoringAddonName: "mcr.microsoft.com/containernetworking/networkmonitor:v0.0.6",
DNSAutoscalerAddonName: "k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.1",
diff --git a/pkg/api/k8s_versions.go b/pkg/api/k8s_versions.go
index 41cd7ee2a0..e6104ef9cb 100644
--- a/pkg/api/k8s_versions.go
+++ b/pkg/api/k8s_versions.go
@@ -28,7 +28,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.16.2",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -63,7 +63,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.16.2",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -98,7 +98,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.15.3",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -133,7 +133,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.14.6",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -168,7 +168,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.13.7",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -203,7 +203,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.12.8",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -237,7 +237,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.3.9",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
@@ -271,7 +271,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.2.5",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.10",
@@ -305,7 +305,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.1.2",
"k8s-dns-sidecar": "k8s-dns-sidecar-amd64:1.14.7",
@@ -338,7 +338,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
@@ -369,7 +369,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
@@ -400,7 +400,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
- ContainerMonitoringAddonName: "oms:ciprod10182019",
+ ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
index 9541743f82..d9676b032c 100644
--- a/pkg/engine/templates_generated.go
+++ b/pkg/engine/templates_generated.go
@@ -23114,7 +23114,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"]
@@ -23376,7 +23376,6 @@ data:
max_retry_wait 9m
retry_mdm_post_wait_minutes 60
-
type out_oms
log_level debug
@@ -26491,7 +26490,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"]
@@ -26694,7 +26693,7 @@ data:
max_retry_wait 9m
-
+
type out_oms
log_level debug
num_threads 5
@@ -32078,7 +32077,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/pkg/engine/testdata/key-vault-certs/kubernetes.json b/pkg/engine/testdata/key-vault-certs/kubernetes.json
index 2cffde77c0..f25973837c 100644
--- a/pkg/engine/testdata/key-vault-certs/kubernetes.json
+++ b/pkg/engine/testdata/key-vault-certs/kubernetes.json
@@ -196,7 +196,7 @@
"containers": [
{
"name": "omsagent",
- "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
+ "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019",
"cpuRequests": "110m",
"memoryRequests": "250Mi",
"cpuLimits": "150m",
@@ -204,7 +204,7 @@
}
],
"config": {
- "dockerProviderVersion": "7.0.0-5",
+ "dockerProviderVersion": "7.0.0-6",
"omsAgentVersion": "1.10.0.1"
}
},
@@ -528,4 +528,4 @@
]
}
}
-}
+}
\ No newline at end of file