support to update memory swap by cri

Signed-off-by: allen.wang <[email protected]>

Author: wangforthinker

cri/v1alpha2/cri.go

@@ -1068,6 +1068,12 @@ func (c *CriManager) UpdateContainerResources(ctx context.Context, r *runtime.Up
 		DiskQuota:      resources.GetDiskQuota(),
 		SpecAnnotation: r.GetSpecAnnotations(),
 	}
+
+	err = applyContainerConfigByAnnotation(updateConfig.SpecAnnotation, nil, nil, updateConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to apply annotation to update config: %v", err)
+	}
+
 	err = c.ContainerMgr.Update(ctx, containerID, updateConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to update resource for container %q: %v", containerID, err)

cri/v1alpha2/cri_utils.go

@@ -846,7 +846,7 @@ func (c *CriManager) updateCreateConfig(createConfig *apitypes.ContainerCreateCo
 
 	if len(config.Annotations) > 0 {
 		// Apply container config by annotation
-		if err := applyContainerConfigByAnnotation(config.Annotations, &createConfig.ContainerConfig, createConfig.HostConfig); err != nil {
+		if err := applyContainerConfigByAnnotation(config.Annotations, &createConfig.ContainerConfig, createConfig.HostConfig, nil); err != nil {
 			return fmt.Errorf("failed to apply container annotation for container %q: %v", config.Metadata.Name, err)
 		}
 	}
@@ -1273,7 +1273,7 @@ func toCNIPortMappings(criPortMappings []*runtime.PortMapping) []ocicni.PortMapp
 }
 
 // applyContainerConfigByAnnotation updates pouch container config according to annotation.
-func applyContainerConfigByAnnotation(annotations map[string]string, config *apitypes.ContainerConfig, hc *apitypes.HostConfig) error {
+func applyContainerConfigByAnnotation(annotations map[string]string, config *apitypes.ContainerConfig, hc *apitypes.HostConfig, uc *apitypes.UpdateConfig) error {
 	if len(annotations) == 0 {
 		return nil
 	}
@@ -1283,8 +1283,13 @@ func applyContainerConfigByAnnotation(annotations map[string]string, config *api
 		if err != nil {
 			return fmt.Errorf("failed to parse resources.memory_swap: %v", err)
 		}
+		if hc != nil {
+			hc.MemorySwap = ms
+		}
 
-		hc.MemorySwap = ms
+		if uc != nil {
+			uc.MemorySwap = ms
+		}
 	}
 
 	return nil

cri/v1alpha2/cri_utils_test.go

@@ -1892,20 +1892,24 @@ func Test_applyContainerConfigByAnnotation(t *testing.T) {
 	tests := []struct {
 		name       string
 		annotation map[string]string
-		checkFn    func(config *apitypes.ContainerConfig, hc *apitypes.HostConfig) bool
+		checkFn    func(config *apitypes.ContainerConfig, hc *apitypes.HostConfig, uc *apitypes.UpdateConfig) bool
 		errMsg     string
 	}{
 		{
 			name: "normalMemorySwapTest",
 			annotation: map[string]string{
 				anno.MemorySwapExtendAnnotation: "200000000",
 			},
-			checkFn: func(config *apitypes.ContainerConfig, hc *apitypes.HostConfig) bool {
-				if hc.MemorySwap == 200000000 {
-					return true
+			checkFn: func(config *apitypes.ContainerConfig, hc *apitypes.HostConfig, uc *apitypes.UpdateConfig) bool {
+				if hc.MemorySwap != 200000000 {
+					return false
 				}
 
-				return false
+				if uc.MemorySwap != 200000000 {
+					return false
+				}
+
+				return true
 			},
 			errMsg: "",
 		},
@@ -1914,7 +1918,7 @@ func Test_applyContainerConfigByAnnotation(t *testing.T) {
 			annotation: map[string]string{
 				anno.MemorySwapExtendAnnotation: "1g",
 			},
-			checkFn: func(config *apitypes.ContainerConfig, hc *apitypes.HostConfig) bool {
+			checkFn: func(config *apitypes.ContainerConfig, hc *apitypes.HostConfig, uc *apitypes.UpdateConfig) bool {
 				return false
 			},
 			errMsg: "failed to parse resources.memory_swap",
@@ -1925,8 +1929,9 @@ func Test_applyContainerConfigByAnnotation(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			config := &apitypes.ContainerConfig{}
 			hc := &apitypes.HostConfig{}
+			uc := &apitypes.UpdateConfig{}
 
-			err := applyContainerConfigByAnnotation(tt.annotation, config, hc)
+			err := applyContainerConfigByAnnotation(tt.annotation, config, hc, uc)
 			if tt.errMsg != "" {
 				assert.NotNil(t, err, "error should be %v", tt.errMsg)
 				if err != nil {
@@ -1936,7 +1941,7 @@ func Test_applyContainerConfigByAnnotation(t *testing.T) {
 
 			if tt.errMsg == "" {
 				assert.Nil(t, err)
-				assert.True(t, tt.checkFn(config, hc))
+				assert.True(t, tt.checkFn(config, hc, uc))
 			}
 		})
 	}