From 1178a2127dd9f7c898097d1d37e245709e2f8e91 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sun, 17 Jan 2021 13:14:00 -0800 Subject: [PATCH 1/3] updates for january 2021 release --- parts/k8s/addons/container-monitoring.yaml | 123 +++++++++++------ pkg/api/addons.go | 24 ++-- pkg/api/addons_test.go | 16 ++- pkg/api/defaults_test.go | 2 +- pkg/engine/templates_generated.go | 125 ++++++++++++------ .../testdata/key-vault-certs/kubernetes.json | 6 +- 6 files changed, 193 insertions(+), 103 deletions(-) diff --git a/parts/k8s/addons/container-monitoring.yaml b/parts/k8s/addons/container-monitoring.yaml index e92409a8e3..11d7fbc0ca 100644 --- a/parts/k8s/addons/container-monitoring.yaml +++ b/parts/k8s/addons/container-monitoring.yaml @@ -30,7 +30,7 @@ metadata: addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: [""] - resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services"] + resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services", "persistentvolumes"] verbs: ["list", "get", "watch"] - apiGroups: ["apps", "extensions", "autoscaling"] resources: ["replicasets", "deployments", "horizontalpodautoscalers"] @@ -61,7 +61,7 @@ kind: ConfigMap apiVersion: v1 data: kube.conf: |- - # Fluentd config file for OMS Docker - cluster components (kubeAPI) + # Fluentd config file for OMS Docker - cluster components (kubeAPI) #fluent forward plugin type forward @@ -75,8 +75,15 @@ data: type kubepodinventory tag oms.containerinsights.KubePodInventory run_interval 60 + log_level debug + + + #Kubernetes Persistent Volume inventory + + type kubepvinventory + tag oms.containerinsights.KubePVInventory + run_interval 60 log_level debug - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth #Kubernetes events @@ -85,7 +92,7 @@ data: tag oms.containerinsights.KubeEvents run_interval 60 log_level debug - + #Kubernetes Nodes @@ -128,15 +135,13 @@ data: - type filter_inventory2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth + type filter_inventory2mdm log_level info #custom_metrics_mdm filter plugin for perf data from windows nodes type filter_cadvisor2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,pvUsedBytes log_level info @@ -149,7 +154,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubepods*.buffer @@ -161,12 +166,27 @@ data: max_retry_wait 5m - + type out_oms log_level debug num_threads 5 buffer_chunk_limit 4m buffer_type file + buffer_path %STATE_DIR_WS%/state/out_oms_kubepv*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + + + + type out_oms + log_level debug + num_threads 2 + buffer_chunk_limit 4m + buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer buffer_queue_limit 20 buffer_queue_full_action drop_oldest_chunk @@ -194,7 +214,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/state/out_oms_kubenodes*.buffer @@ -223,7 +243,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeperf*.buffer @@ -282,35 +302,35 @@ data: retry_mdm_post_wait_minutes 30 - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + metadata: name: omsagent-rs-config namespace: kube-system @@ -345,6 +365,10 @@ spec: spec: priorityClassName: system-node-critical serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent image: {{ContainerImage "omsagent"}} @@ -508,11 +532,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: {{ContainerCPULimits "omsagent"}} - memory: {{ContainerMemLimits "omsagent"}} + cpu: {{ContainerCPULimits "omsagent-rs"}} + memory: {{ContainerMemLimits "omsagent-rs"}} requests: - cpu: {{ContainerCPUReqs "omsagent"}} - memory: {{ContainerMemReqs "omsagent"}} + cpu: {{ContainerCPUReqs "omsagent-rs"}} + memory: {{ContainerMemReqs "omsagent-rs"}} env: - name: NODE_IP valueFrom: @@ -565,6 +589,15 @@ spec: periodSeconds: 60 affinity: nodeAffinity: + # affinity to schedule on to ephemeral os node if its available + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: storageprofile + operator: NotIn + values: + - managed requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - labelSelector: @@ -642,6 +675,10 @@ spec: schema-versions: {{ContainerConfig "schema-versions"}} spec: serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent-win image: {{ContainerImage "omsagent-win"}} diff --git a/pkg/api/addons.go b/pkg/api/addons.go index 9ce32d58f6..b13834b3e6 100644 --- a/pkg/api/addons.go +++ b/pkg/api/addons.go @@ -31,21 +31,21 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { kubernetesImageBase = o.KubernetesConfig.KubernetesImageBase } k8sComponents := GetK8sComponentsByVersionMap(o.KubernetesConfig)[o.OrchestratorVersion] - omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020" - omsagentWinImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10052020" + omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021" + omsagentWinImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021" var workspaceDomain string if cs.Properties.IsCustomCloudProfile() { dependenciesLocation := string(cs.Properties.CustomCloudProfile.DependenciesLocation) workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(dependenciesLocation) if strings.EqualFold(dependenciesLocation, "china") { - omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod10052020" - omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod10052020" + omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod01112021" + omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod01112021" } } else { workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(cloudSpecConfig.CloudName) if strings.EqualFold(cloudSpecConfig.CloudName, "AzureChinaCloud") { - omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod10052020" - omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod10052020" + omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod01112021" + omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod01112021" } } workspaceDomain = base64.StdEncoding.EncodeToString([]byte(workspaceDomain)) @@ -266,7 +266,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { Enabled: to.BoolPtr(DefaultContainerMonitoringAddonEnabled && !cs.Properties.IsAzureStackCloud()), Config: map[string]string{ "omsAgentVersion": "1.10.0.1", - "dockerProviderVersion": "10.0.0-1", + "dockerProviderVersion": "12.0.0-0", "schema-versions": "v1", "clusterName": clusterDNSPrefix, "workspaceDomain": workspaceDomain, @@ -274,10 +274,18 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { Containers: []KubernetesContainerSpec{ { Name: "omsagent", + CPURequests: "75m", + MemoryRequests: "225Mi", + CPULimits: "500m", + MemoryLimits: "600Mi", + Image: omsagentImage, + }, + { + Name: "omsagent-rs", CPURequests: "150m", MemoryRequests: "250Mi", CPULimits: "1", - MemoryLimits: "750Mi", + MemoryLimits: "1Gi", Image: omsagentImage, }, { diff --git a/pkg/api/addons_test.go b/pkg/api/addons_test.go index 80bdd0a2d3..cd52426036 100644 --- a/pkg/api/addons_test.go +++ b/pkg/api/addons_test.go @@ -1564,7 +1564,7 @@ func TestSetAddonsConfig(t *testing.T) { Enabled: to.BoolPtr(true), Config: map[string]string{ "omsAgentVersion": "1.10.0.1", - "dockerProviderVersion": "10.0.0-1", + "dockerProviderVersion": "12.0.0-0", "schema-versions": "v1", "clusterName": "aks-engine-cluster", "workspaceDomain": "b3BpbnNpZ2h0cy5henVyZS5jb20=", @@ -1572,17 +1572,25 @@ func TestSetAddonsConfig(t *testing.T) { Containers: []KubernetesContainerSpec{ { Name: "omsagent", + CPURequests: "75m", + MemoryRequests: "225Mi", + CPULimits: "500m", + MemoryLimits: "600Mi", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", + }, + { + Name: "omsagent-rs", CPURequests: "150m", MemoryRequests: "250Mi", CPULimits: "1", - MemoryLimits: "750Mi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020", + MemoryLimits: "1Gi", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", }, { Name: "omsagent-win", CPULimits: "200m", MemoryLimits: "600Mi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10052020", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021", }, }, }, diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go index 8bf0a1f531..18cf77350e 100644 --- a/pkg/api/defaults_test.go +++ b/pkg/api/defaults_test.go @@ -246,7 +246,7 @@ func TestAssignDefaultAddonImages(t *testing.T) { common.ReschedulerAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.ReschedulerAddonName], common.MetricsServerAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.MetricsServerAddonName], common.NVIDIADevicePluginAddonName: specConfig.NVIDIAImageBase + k8sComponents[common.NVIDIADevicePluginAddonName], - common.ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020", + common.ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", common.IPMASQAgentAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.IPMASQAgentAddonName], common.AzureCNINetworkMonitorAddonName: specConfig.AzureCNIImageBase + k8sComponents[common.AzureCNINetworkMonitorAddonName], common.CalicoAddonName: specConfig.CalicoImageBase + k8sComponents[common.CalicoTyphaComponentName], diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go index 610e4bc40b..5ccd008605 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -7538,7 +7538,7 @@ metadata: addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: [""] - resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services"] + resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services", "persistentvolumes"] verbs: ["list", "get", "watch"] - apiGroups: ["apps", "extensions", "autoscaling"] resources: ["replicasets", "deployments", "horizontalpodautoscalers"] @@ -7569,7 +7569,7 @@ kind: ConfigMap apiVersion: v1 data: kube.conf: |- - # Fluentd config file for OMS Docker - cluster components (kubeAPI) + # Fluentd config file for OMS Docker - cluster components (kubeAPI) #fluent forward plugin type forward @@ -7583,8 +7583,15 @@ data: type kubepodinventory tag oms.containerinsights.KubePodInventory run_interval 60 + log_level debug + + + #Kubernetes Persistent Volume inventory + + type kubepvinventory + tag oms.containerinsights.KubePVInventory + run_interval 60 log_level debug - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth #Kubernetes events @@ -7593,7 +7600,7 @@ data: tag oms.containerinsights.KubeEvents run_interval 60 log_level debug - + #Kubernetes Nodes @@ -7636,15 +7643,13 @@ data: - type filter_inventory2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth + type filter_inventory2mdm log_level info #custom_metrics_mdm filter plugin for perf data from windows nodes type filter_cadvisor2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,pvUsedBytes log_level info @@ -7657,7 +7662,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubepods*.buffer @@ -7669,12 +7674,27 @@ data: max_retry_wait 5m - + type out_oms log_level debug num_threads 5 buffer_chunk_limit 4m buffer_type file + buffer_path %STATE_DIR_WS%/state/out_oms_kubepv*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + + + + type out_oms + log_level debug + num_threads 2 + buffer_chunk_limit 4m + buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer buffer_queue_limit 20 buffer_queue_full_action drop_oldest_chunk @@ -7702,7 +7722,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/state/out_oms_kubenodes*.buffer @@ -7731,7 +7751,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeperf*.buffer @@ -7790,35 +7810,35 @@ data: retry_mdm_post_wait_minutes 30 - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - - - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + + + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + metadata: name: omsagent-rs-config namespace: kube-system @@ -7853,6 +7873,10 @@ spec: spec: priorityClassName: system-node-critical serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent image: {{ContainerImage "omsagent"}} @@ -8016,11 +8040,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: {{ContainerCPULimits "omsagent"}} - memory: {{ContainerMemLimits "omsagent"}} + cpu: {{ContainerCPULimits "omsagent-rs"}} + memory: {{ContainerMemLimits "omsagent-rs"}} requests: - cpu: {{ContainerCPUReqs "omsagent"}} - memory: {{ContainerMemReqs "omsagent"}} + cpu: {{ContainerCPUReqs "omsagent-rs"}} + memory: {{ContainerMemReqs "omsagent-rs"}} env: - name: NODE_IP valueFrom: @@ -8073,6 +8097,15 @@ spec: periodSeconds: 60 affinity: nodeAffinity: + # affinity to schedule on to ephemeral os node if its available + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: storageprofile + operator: NotIn + values: + - managed requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - labelSelector: @@ -8150,6 +8183,10 @@ spec: schema-versions: {{ContainerConfig "schema-versions"}} spec: serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent-win image: {{ContainerImage "omsagent-win"}} diff --git a/pkg/engine/testdata/key-vault-certs/kubernetes.json b/pkg/engine/testdata/key-vault-certs/kubernetes.json index 21f3d95763..cc7f0c75ad 100644 --- a/pkg/engine/testdata/key-vault-certs/kubernetes.json +++ b/pkg/engine/testdata/key-vault-certs/kubernetes.json @@ -181,7 +181,7 @@ "containers": [ { "name": "omsagent", - "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020", + "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", "cpuRequests": "150m", "memoryRequests": "250Mi", "cpuLimits": "1", @@ -189,7 +189,7 @@ }, { "name": "omsagentWin", - "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10052020", + "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021", "cpuRequests": "150m", "memoryRequests": "250Mi", "cpuLimits": "1", @@ -197,7 +197,7 @@ } ], "config": { - "dockerProviderVersion": "10.0.0-1", + "dockerProviderVersion": "12.0.0-0", "omsAgentVersion": "1.10.0.1" } }, From 03a9f08d167048fc92a8eca71807062752248e8b Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sun, 17 Jan 2021 13:14:00 -0800 Subject: [PATCH 2/3] feat: updates for container monitoring addon omsagent agent January 2021 release --- parts/k8s/addons/container-monitoring.yaml | 123 +++++++++++------ pkg/api/addons.go | 24 ++-- pkg/api/addons_test.go | 16 ++- pkg/api/defaults_test.go | 2 +- pkg/engine/templates_generated.go | 125 ++++++++++++------ .../testdata/key-vault-certs/kubernetes.json | 6 +- 6 files changed, 193 insertions(+), 103 deletions(-) diff --git a/parts/k8s/addons/container-monitoring.yaml b/parts/k8s/addons/container-monitoring.yaml index e92409a8e3..11d7fbc0ca 100644 --- a/parts/k8s/addons/container-monitoring.yaml +++ b/parts/k8s/addons/container-monitoring.yaml @@ -30,7 +30,7 @@ metadata: addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: [""] - resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services"] + resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services", "persistentvolumes"] verbs: ["list", "get", "watch"] - apiGroups: ["apps", "extensions", "autoscaling"] resources: ["replicasets", "deployments", "horizontalpodautoscalers"] @@ -61,7 +61,7 @@ kind: ConfigMap apiVersion: v1 data: kube.conf: |- - # Fluentd config file for OMS Docker - cluster components (kubeAPI) + # Fluentd config file for OMS Docker - cluster components (kubeAPI) #fluent forward plugin type forward @@ -75,8 +75,15 @@ data: type kubepodinventory tag oms.containerinsights.KubePodInventory run_interval 60 + log_level debug + + + #Kubernetes Persistent Volume inventory + + type kubepvinventory + tag oms.containerinsights.KubePVInventory + run_interval 60 log_level debug - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth #Kubernetes events @@ -85,7 +92,7 @@ data: tag oms.containerinsights.KubeEvents run_interval 60 log_level debug - + #Kubernetes Nodes @@ -128,15 +135,13 @@ data: - type filter_inventory2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth + type filter_inventory2mdm log_level info #custom_metrics_mdm filter plugin for perf data from windows nodes type filter_cadvisor2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,pvUsedBytes log_level info @@ -149,7 +154,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubepods*.buffer @@ -161,12 +166,27 @@ data: max_retry_wait 5m - + type out_oms log_level debug num_threads 5 buffer_chunk_limit 4m buffer_type file + buffer_path %STATE_DIR_WS%/state/out_oms_kubepv*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + + + + type out_oms + log_level debug + num_threads 2 + buffer_chunk_limit 4m + buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer buffer_queue_limit 20 buffer_queue_full_action drop_oldest_chunk @@ -194,7 +214,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/state/out_oms_kubenodes*.buffer @@ -223,7 +243,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeperf*.buffer @@ -282,35 +302,35 @@ data: retry_mdm_post_wait_minutes 30 - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + metadata: name: omsagent-rs-config namespace: kube-system @@ -345,6 +365,10 @@ spec: spec: priorityClassName: system-node-critical serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent image: {{ContainerImage "omsagent"}} @@ -508,11 +532,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: {{ContainerCPULimits "omsagent"}} - memory: {{ContainerMemLimits "omsagent"}} + cpu: {{ContainerCPULimits "omsagent-rs"}} + memory: {{ContainerMemLimits "omsagent-rs"}} requests: - cpu: {{ContainerCPUReqs "omsagent"}} - memory: {{ContainerMemReqs "omsagent"}} + cpu: {{ContainerCPUReqs "omsagent-rs"}} + memory: {{ContainerMemReqs "omsagent-rs"}} env: - name: NODE_IP valueFrom: @@ -565,6 +589,15 @@ spec: periodSeconds: 60 affinity: nodeAffinity: + # affinity to schedule on to ephemeral os node if its available + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: storageprofile + operator: NotIn + values: + - managed requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - labelSelector: @@ -642,6 +675,10 @@ spec: schema-versions: {{ContainerConfig "schema-versions"}} spec: serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent-win image: {{ContainerImage "omsagent-win"}} diff --git a/pkg/api/addons.go b/pkg/api/addons.go index 9ce32d58f6..b13834b3e6 100644 --- a/pkg/api/addons.go +++ b/pkg/api/addons.go @@ -31,21 +31,21 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { kubernetesImageBase = o.KubernetesConfig.KubernetesImageBase } k8sComponents := GetK8sComponentsByVersionMap(o.KubernetesConfig)[o.OrchestratorVersion] - omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020" - omsagentWinImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10052020" + omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021" + omsagentWinImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021" var workspaceDomain string if cs.Properties.IsCustomCloudProfile() { dependenciesLocation := string(cs.Properties.CustomCloudProfile.DependenciesLocation) workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(dependenciesLocation) if strings.EqualFold(dependenciesLocation, "china") { - omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod10052020" - omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod10052020" + omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod01112021" + omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod01112021" } } else { workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(cloudSpecConfig.CloudName) if strings.EqualFold(cloudSpecConfig.CloudName, "AzureChinaCloud") { - omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod10052020" - omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod10052020" + omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod01112021" + omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod01112021" } } workspaceDomain = base64.StdEncoding.EncodeToString([]byte(workspaceDomain)) @@ -266,7 +266,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { Enabled: to.BoolPtr(DefaultContainerMonitoringAddonEnabled && !cs.Properties.IsAzureStackCloud()), Config: map[string]string{ "omsAgentVersion": "1.10.0.1", - "dockerProviderVersion": "10.0.0-1", + "dockerProviderVersion": "12.0.0-0", "schema-versions": "v1", "clusterName": clusterDNSPrefix, "workspaceDomain": workspaceDomain, @@ -274,10 +274,18 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { Containers: []KubernetesContainerSpec{ { Name: "omsagent", + CPURequests: "75m", + MemoryRequests: "225Mi", + CPULimits: "500m", + MemoryLimits: "600Mi", + Image: omsagentImage, + }, + { + Name: "omsagent-rs", CPURequests: "150m", MemoryRequests: "250Mi", CPULimits: "1", - MemoryLimits: "750Mi", + MemoryLimits: "1Gi", Image: omsagentImage, }, { diff --git a/pkg/api/addons_test.go b/pkg/api/addons_test.go index 80bdd0a2d3..cd52426036 100644 --- a/pkg/api/addons_test.go +++ b/pkg/api/addons_test.go @@ -1564,7 +1564,7 @@ func TestSetAddonsConfig(t *testing.T) { Enabled: to.BoolPtr(true), Config: map[string]string{ "omsAgentVersion": "1.10.0.1", - "dockerProviderVersion": "10.0.0-1", + "dockerProviderVersion": "12.0.0-0", "schema-versions": "v1", "clusterName": "aks-engine-cluster", "workspaceDomain": "b3BpbnNpZ2h0cy5henVyZS5jb20=", @@ -1572,17 +1572,25 @@ func TestSetAddonsConfig(t *testing.T) { Containers: []KubernetesContainerSpec{ { Name: "omsagent", + CPURequests: "75m", + MemoryRequests: "225Mi", + CPULimits: "500m", + MemoryLimits: "600Mi", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", + }, + { + Name: "omsagent-rs", CPURequests: "150m", MemoryRequests: "250Mi", CPULimits: "1", - MemoryLimits: "750Mi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020", + MemoryLimits: "1Gi", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", }, { Name: "omsagent-win", CPULimits: "200m", MemoryLimits: "600Mi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10052020", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021", }, }, }, diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go index 8bf0a1f531..18cf77350e 100644 --- a/pkg/api/defaults_test.go +++ b/pkg/api/defaults_test.go @@ -246,7 +246,7 @@ func TestAssignDefaultAddonImages(t *testing.T) { common.ReschedulerAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.ReschedulerAddonName], common.MetricsServerAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.MetricsServerAddonName], common.NVIDIADevicePluginAddonName: specConfig.NVIDIAImageBase + k8sComponents[common.NVIDIADevicePluginAddonName], - common.ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020", + common.ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", common.IPMASQAgentAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.IPMASQAgentAddonName], common.AzureCNINetworkMonitorAddonName: specConfig.AzureCNIImageBase + k8sComponents[common.AzureCNINetworkMonitorAddonName], common.CalicoAddonName: specConfig.CalicoImageBase + k8sComponents[common.CalicoTyphaComponentName], diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go index 610e4bc40b..5ccd008605 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -7538,7 +7538,7 @@ metadata: addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: [""] - resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services"] + resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "nodes/proxy", "namespaces", "services", "persistentvolumes"] verbs: ["list", "get", "watch"] - apiGroups: ["apps", "extensions", "autoscaling"] resources: ["replicasets", "deployments", "horizontalpodautoscalers"] @@ -7569,7 +7569,7 @@ kind: ConfigMap apiVersion: v1 data: kube.conf: |- - # Fluentd config file for OMS Docker - cluster components (kubeAPI) + # Fluentd config file for OMS Docker - cluster components (kubeAPI) #fluent forward plugin type forward @@ -7583,8 +7583,15 @@ data: type kubepodinventory tag oms.containerinsights.KubePodInventory run_interval 60 + log_level debug + + + #Kubernetes Persistent Volume inventory + + type kubepvinventory + tag oms.containerinsights.KubePVInventory + run_interval 60 log_level debug - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth #Kubernetes events @@ -7593,7 +7600,7 @@ data: tag oms.containerinsights.KubeEvents run_interval 60 log_level debug - + #Kubernetes Nodes @@ -7636,15 +7643,13 @@ data: - type filter_inventory2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth + type filter_inventory2mdm log_level info #custom_metrics_mdm filter plugin for perf data from windows nodes type filter_cadvisor2mdm - custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast,eastus2,westus,australiasoutheast,brazilsouth,germanywestcentral,northcentralus,switzerlandnorth metrics_to_collect cpuUsageNanoCores,memoryWorkingSetBytes,pvUsedBytes log_level info @@ -7657,7 +7662,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubepods*.buffer @@ -7669,12 +7674,27 @@ data: max_retry_wait 5m - + type out_oms log_level debug num_threads 5 buffer_chunk_limit 4m buffer_type file + buffer_path %STATE_DIR_WS%/state/out_oms_kubepv*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + + + + type out_oms + log_level debug + num_threads 2 + buffer_chunk_limit 4m + buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeevents*.buffer buffer_queue_limit 20 buffer_queue_full_action drop_oldest_chunk @@ -7702,7 +7722,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/state/out_oms_kubenodes*.buffer @@ -7731,7 +7751,7 @@ data: type out_oms log_level debug - num_threads 5 + num_threads 2 buffer_chunk_limit 4m buffer_type file buffer_path %STATE_DIR_WS%/out_oms_kubeperf*.buffer @@ -7790,35 +7810,35 @@ data: retry_mdm_post_wait_minutes 30 - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - - - - type out_oms - log_level debug - num_threads 5 - buffer_chunk_limit 4m - buffer_type file - buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer - buffer_queue_limit 20 - buffer_queue_full_action drop_oldest_chunk - flush_interval 20s - retry_limit 10 - retry_wait 5s - max_retry_wait 5m - + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + + + + type out_oms + log_level debug + num_threads 5 + buffer_chunk_limit 4m + buffer_type file + buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer + buffer_queue_limit 20 + buffer_queue_full_action drop_oldest_chunk + flush_interval 20s + retry_limit 10 + retry_wait 5s + max_retry_wait 5m + metadata: name: omsagent-rs-config namespace: kube-system @@ -7853,6 +7873,10 @@ spec: spec: priorityClassName: system-node-critical serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent image: {{ContainerImage "omsagent"}} @@ -8016,11 +8040,11 @@ spec: imagePullPolicy: IfNotPresent resources: limits: - cpu: {{ContainerCPULimits "omsagent"}} - memory: {{ContainerMemLimits "omsagent"}} + cpu: {{ContainerCPULimits "omsagent-rs"}} + memory: {{ContainerMemLimits "omsagent-rs"}} requests: - cpu: {{ContainerCPUReqs "omsagent"}} - memory: {{ContainerMemReqs "omsagent"}} + cpu: {{ContainerCPUReqs "omsagent-rs"}} + memory: {{ContainerMemReqs "omsagent-rs"}} env: - name: NODE_IP valueFrom: @@ -8073,6 +8097,15 @@ spec: periodSeconds: 60 affinity: nodeAffinity: + # affinity to schedule on to ephemeral os node if its available + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 1 + preference: + matchExpressions: + - key: storageprofile + operator: NotIn + values: + - managed requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - labelSelector: @@ -8150,6 +8183,10 @@ spec: schema-versions: {{ContainerConfig "schema-versions"}} spec: serviceAccountName: omsagent + dnsConfig: + options: + - name: ndots + value: "3" containers: - name: omsagent-win image: {{ContainerImage "omsagent-win"}} diff --git a/pkg/engine/testdata/key-vault-certs/kubernetes.json b/pkg/engine/testdata/key-vault-certs/kubernetes.json index 21f3d95763..cc7f0c75ad 100644 --- a/pkg/engine/testdata/key-vault-certs/kubernetes.json +++ b/pkg/engine/testdata/key-vault-certs/kubernetes.json @@ -181,7 +181,7 @@ "containers": [ { "name": "omsagent", - "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10052020", + "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", "cpuRequests": "150m", "memoryRequests": "250Mi", "cpuLimits": "1", @@ -189,7 +189,7 @@ }, { "name": "omsagentWin", - "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod10052020", + "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021", "cpuRequests": "150m", "memoryRequests": "250Mi", "cpuLimits": "1", @@ -197,7 +197,7 @@ } ], "config": { - "dockerProviderVersion": "10.0.0-1", + "dockerProviderVersion": "12.0.0-0", "omsAgentVersion": "1.10.0.1" } }, From 49efb3ac9ca68380de8f7bacb46734dca36d75a2 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Mon, 15 Mar 2021 19:58:54 -0700 Subject: [PATCH 3/3] updates for ciprod02232021 release --- pkg/api/addons.go | 14 +++++++------- pkg/api/addons_test.go | 8 ++++---- pkg/api/defaults_test.go | 2 +- .../testdata/key-vault-certs/kubernetes.json | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkg/api/addons.go b/pkg/api/addons.go index 313f8faec8..bf6eece0dd 100644 --- a/pkg/api/addons.go +++ b/pkg/api/addons.go @@ -31,21 +31,21 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { kubernetesImageBase = o.KubernetesConfig.KubernetesImageBase } k8sComponents := GetK8sComponentsByVersionMap(o.KubernetesConfig)[o.OrchestratorVersion] - omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021" - omsagentWinImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021" + omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021" + omsagentWinImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod02232021" var workspaceDomain string if cs.Properties.IsCustomCloudProfile() { dependenciesLocation := string(cs.Properties.CustomCloudProfile.DependenciesLocation) workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(dependenciesLocation) if strings.EqualFold(dependenciesLocation, "china") { - omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod01112021" - omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod01112021" + omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod02232021" + omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod02232021" } } else { workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(cloudSpecConfig.CloudName) if strings.EqualFold(cloudSpecConfig.CloudName, "AzureChinaCloud") { - omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod01112021" - omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod01112021" + omsagentImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:ciprod02232021" + omsagentWinImage = "mcr.azk8s.cn/azuremonitor/containerinsights/ciprod:win-ciprod02232021" } } workspaceDomain = base64.StdEncoding.EncodeToString([]byte(workspaceDomain)) @@ -230,7 +230,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) { Enabled: to.BoolPtr(DefaultContainerMonitoringAddonEnabled && !cs.Properties.IsAzureStackCloud()), Config: map[string]string{ "omsAgentVersion": "1.10.0.1", - "dockerProviderVersion": "12.0.0-0", + "dockerProviderVersion": "13.0.0-0", "schema-versions": "v1", "clusterName": clusterDNSPrefix, "workspaceDomain": workspaceDomain, diff --git a/pkg/api/addons_test.go b/pkg/api/addons_test.go index e030492217..a4b957efbc 100644 --- a/pkg/api/addons_test.go +++ b/pkg/api/addons_test.go @@ -1471,7 +1471,7 @@ func TestSetAddonsConfig(t *testing.T) { Enabled: to.BoolPtr(true), Config: map[string]string{ "omsAgentVersion": "1.10.0.1", - "dockerProviderVersion": "12.0.0-0", + "dockerProviderVersion": "13.0.0-0", "schema-versions": "v1", "clusterName": "aks-engine-cluster", "workspaceDomain": "b3BpbnNpZ2h0cy5henVyZS5jb20=", @@ -1483,7 +1483,7 @@ func TestSetAddonsConfig(t *testing.T) { MemoryRequests: "225Mi", CPULimits: "500m", MemoryLimits: "600Mi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021", }, { Name: "omsagent-rs", @@ -1491,13 +1491,13 @@ func TestSetAddonsConfig(t *testing.T) { MemoryRequests: "250Mi", CPULimits: "1", MemoryLimits: "1Gi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021", }, { Name: "omsagent-win", CPULimits: "200m", MemoryLimits: "600Mi", - Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021", + Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod02232021", }, }, }, diff --git a/pkg/api/defaults_test.go b/pkg/api/defaults_test.go index 30badbbd82..755c9cf8eb 100644 --- a/pkg/api/defaults_test.go +++ b/pkg/api/defaults_test.go @@ -244,7 +244,7 @@ func TestAssignDefaultAddonImages(t *testing.T) { common.DashboardAddonName: k8sComponents[common.DashboardAddonName], common.MetricsServerAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.MetricsServerAddonName], common.NVIDIADevicePluginAddonName: specConfig.NVIDIAImageBase + k8sComponents[common.NVIDIADevicePluginAddonName], - common.ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", + common.ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021", common.IPMASQAgentAddonName: specConfig.MCRKubernetesImageBase + k8sComponents[common.IPMASQAgentAddonName], common.AzureCNINetworkMonitorAddonName: specConfig.AzureCNIImageBase + k8sComponents[common.AzureCNINetworkMonitorAddonName], common.CalicoAddonName: specConfig.CalicoImageBase + k8sComponents[common.CalicoTyphaComponentName], diff --git a/pkg/engine/testdata/key-vault-certs/kubernetes.json b/pkg/engine/testdata/key-vault-certs/kubernetes.json index fc9518ae82..63911cbac3 100644 --- a/pkg/engine/testdata/key-vault-certs/kubernetes.json +++ b/pkg/engine/testdata/key-vault-certs/kubernetes.json @@ -131,7 +131,7 @@ "containers": [ { "name": "omsagent", - "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod01112021", + "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod02232021", "cpuRequests": "150m", "memoryRequests": "250Mi", "cpuLimits": "1", @@ -139,7 +139,7 @@ }, { "name": "omsagentWin", - "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod01112021", + "image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod02232021", "cpuRequests": "150m", "memoryRequests": "250Mi", "cpuLimits": "1", @@ -147,7 +147,7 @@ } ], "config": { - "dockerProviderVersion": "12.0.0-0", + "dockerProviderVersion": "13.0.0-0", "omsAgentVersion": "1.10.0.1" } },