mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #21865 from piosz/cluster-autoscaling-cleanup
Cluster autoscaling cleanup
This commit is contained in:
		@@ -1358,120 +1358,6 @@ func TestValidateIngressStatusUpdate(t *testing.T) {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestValidateClusterAutoscaler(t *testing.T) {
 | 
			
		||||
	successCases := []extensions.ClusterAutoscaler{
 | 
			
		||||
		{
 | 
			
		||||
			ObjectMeta: api.ObjectMeta{
 | 
			
		||||
				Name:      "ClusterAutoscaler",
 | 
			
		||||
				Namespace: api.NamespaceDefault,
 | 
			
		||||
			},
 | 
			
		||||
			Spec: extensions.ClusterAutoscalerSpec{
 | 
			
		||||
				MinNodes: 1,
 | 
			
		||||
				MaxNodes: 5,
 | 
			
		||||
				TargetUtilization: []extensions.NodeUtilization{
 | 
			
		||||
					{
 | 
			
		||||
						Resource: extensions.CpuRequest,
 | 
			
		||||
						Value:    0.7,
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
	for _, successCase := range successCases {
 | 
			
		||||
		if errs := ValidateClusterAutoscaler(&successCase); len(errs) != 0 {
 | 
			
		||||
			t.Errorf("expected success: %v", errs)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	errorCases := map[string]extensions.ClusterAutoscaler{
 | 
			
		||||
		"must be 'ClusterAutoscaler'": {
 | 
			
		||||
			ObjectMeta: api.ObjectMeta{
 | 
			
		||||
				Name:      "TestClusterAutoscaler",
 | 
			
		||||
				Namespace: api.NamespaceDefault,
 | 
			
		||||
			},
 | 
			
		||||
			Spec: extensions.ClusterAutoscalerSpec{
 | 
			
		||||
				MinNodes: 1,
 | 
			
		||||
				MaxNodes: 5,
 | 
			
		||||
				TargetUtilization: []extensions.NodeUtilization{
 | 
			
		||||
					{
 | 
			
		||||
						Resource: extensions.CpuRequest,
 | 
			
		||||
						Value:    0.7,
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		"must be 'default'": {
 | 
			
		||||
			ObjectMeta: api.ObjectMeta{
 | 
			
		||||
				Name:      "ClusterAutoscaler",
 | 
			
		||||
				Namespace: "test",
 | 
			
		||||
			},
 | 
			
		||||
			Spec: extensions.ClusterAutoscalerSpec{
 | 
			
		||||
				MinNodes: 1,
 | 
			
		||||
				MaxNodes: 5,
 | 
			
		||||
				TargetUtilization: []extensions.NodeUtilization{
 | 
			
		||||
					{
 | 
			
		||||
						Resource: extensions.CpuRequest,
 | 
			
		||||
						Value:    0.7,
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
		`must be greater than or equal to 0`: {
 | 
			
		||||
			ObjectMeta: api.ObjectMeta{
 | 
			
		||||
				Name:      "ClusterAutoscaler",
 | 
			
		||||
				Namespace: api.NamespaceDefault,
 | 
			
		||||
			},
 | 
			
		||||
			Spec: extensions.ClusterAutoscalerSpec{
 | 
			
		||||
				MinNodes: -1,
 | 
			
		||||
				MaxNodes: 5,
 | 
			
		||||
				TargetUtilization: []extensions.NodeUtilization{
 | 
			
		||||
					{
 | 
			
		||||
						Resource: extensions.CpuRequest,
 | 
			
		||||
						Value:    0.7,
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		"must be greater than or equal to `minNodes`": {
 | 
			
		||||
			ObjectMeta: api.ObjectMeta{
 | 
			
		||||
				Name:      "ClusterAutoscaler",
 | 
			
		||||
				Namespace: api.NamespaceDefault,
 | 
			
		||||
			},
 | 
			
		||||
			Spec: extensions.ClusterAutoscalerSpec{
 | 
			
		||||
				MinNodes: 10,
 | 
			
		||||
				MaxNodes: 5,
 | 
			
		||||
				TargetUtilization: []extensions.NodeUtilization{
 | 
			
		||||
					{
 | 
			
		||||
						Resource: extensions.CpuRequest,
 | 
			
		||||
						Value:    0.7,
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		"Required value": {
 | 
			
		||||
			ObjectMeta: api.ObjectMeta{
 | 
			
		||||
				Name:      "ClusterAutoscaler",
 | 
			
		||||
				Namespace: api.NamespaceDefault,
 | 
			
		||||
			},
 | 
			
		||||
			Spec: extensions.ClusterAutoscalerSpec{
 | 
			
		||||
				MinNodes:          1,
 | 
			
		||||
				MaxNodes:          5,
 | 
			
		||||
				TargetUtilization: []extensions.NodeUtilization{},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for k, v := range errorCases {
 | 
			
		||||
		errs := ValidateClusterAutoscaler(&v)
 | 
			
		||||
		if len(errs) == 0 {
 | 
			
		||||
			t.Errorf("[%s] expected failure", k)
 | 
			
		||||
		} else if !strings.Contains(errs[0].Error(), k) {
 | 
			
		||||
			t.Errorf("unexpected error: %v, expected: %q", errs[0], k)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func TestValidateScale(t *testing.T) {
 | 
			
		||||
	successCases := []extensions.Scale{
 | 
			
		||||
		{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user