Merge pull request #20703 from mwielgus/hpa-cm-validation

Auto commit by PR queue bot
2016-02-06 21:16:51 -08:00
parent 9e1d764524 9a74a60413
commit e76caf43aa
4 changed files with 134 additions and 4 deletions
--- a/pkg/controller/podautoscaler/horizontal_test.go
+++ b/pkg/controller/podautoscaler/horizontal_test.go
@@ -110,7 +110,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset {
 				t.Fatalf("Failed to marshal cm: %v", err)
 			}
 			obj.Items[0].Annotations = make(map[string]string)
-			obj.Items[0].Annotations[HpaCustomMetricsDefinitionAnnotationName] = string(b)
+			obj.Items[0].Annotations[HpaCustomMetricsTargetAnnotationName] = string(b)
 		}
 		return true, obj, nil
 	})