updates for ciprod02232021 release

Azure · Mar 16, 2021 · 49efb3a · 49efb3a
1 parent c2b1548
commit 49efb3a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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,21 +1483,21 @@ 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",
 							CPURequests:    "150m",
 							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
@@ -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
@@ -131,23 +131,23 @@
             "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",
                 "memoryLimits": "750Mi"
               },
               {
                 "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",
                 "memoryLimits": "750Mi"
               }
             ],
             "config": {
-              "dockerProviderVersion": "12.0.0-0",
+              "dockerProviderVersion": "13.0.0-0",
               "omsAgentVersion": "1.10.0.1"
             }
           },