Skip to content

K
k3s
Unverified Commit 8d02b2b3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60433 from MaciekPytel/hpa_validation

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Validate path in external metric name Add validation following comments on https://github.com/kubernetes/kubernetes/pull/60220
parents 44c166cd 4e7bc56a
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 13 deletions
pkg/apis/autoscaling/validation/validation.go
View file @ 8d02b2b3
......@@ -195,6 +195,10 @@ func validateExternalSource(src *autoscaling.ExternalMetricSource, fldPath *fiel
if len(src.MetricName) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("metricName"), "must specify a metric name"))
} else {
for _, msg := range pathvalidation.IsValidPathSegmentName(src.MetricName) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("metricName"), src.MetricName, msg))
}
}
if src.TargetValue == nil && src.TargetAverageValue == nil {
......
pkg/apis/autoscaling/validation/validation_test.go
View file @ 8d02b2b3
......@@ -169,7 +169,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.PodsMetricSourceType,
Pods: &autoscaling.PodsMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
TargetAverageValue: *resource.NewMilliQuantity(300, resource.DecimalSI),
},
},
......@@ -196,7 +196,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
Kind: "ReplicationController",
Name: "myrc",
},
MetricName: "some/metric",
MetricName: "somemetric",
TargetValue: *resource.NewMilliQuantity(300, resource.DecimalSI),
},
},
......@@ -219,7 +219,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
......@@ -247,7 +247,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
......@@ -490,7 +490,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.PodsMetricSourceType,
Pods: &autoscaling.PodsMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
},
},
},
......@@ -512,7 +512,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
Target: autoscaling.CrossVersionObjectReference{
Name: "myrc",
},
MetricName: "some/metric",
MetricName: "somemetric",
TargetValue: *resource.NewMilliQuantity(100, resource.DecimalSI),
},
},
......@@ -579,7 +579,33 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "some/metric",
MetricName: "foo/../",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
},
},
TargetValue: resource.NewMilliQuantity(300, resource.DecimalSI),
},
},
},
},
},
msg: "'/'",
},
{
horizontalPodAutoscaler: autoscaling.HorizontalPodAutoscaler{
ObjectMeta: metav1.ObjectMeta{Name: "myautoscaler", Namespace: metav1.NamespaceDefault},
Spec: autoscaling.HorizontalPodAutoscalerSpec{
ScaleTargetRef: autoscaling.CrossVersionObjectReference{Name: "myrc", Kind: "ReplicationController"},
MinReplicas: utilpointer.Int32Ptr(1),
MaxReplicas: 5,
Metrics: []autoscaling.MetricSpec{
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "somemetric",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
......@@ -603,7 +629,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
......@@ -628,7 +654,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
......@@ -653,7 +679,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
{
Type: autoscaling.ExternalMetricSourceType,
External: &autoscaling.ExternalMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
MetricSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"label": "value",
......@@ -713,7 +739,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
TargetAverageValue: resource.NewMilliQuantity(100, resource.DecimalSI),
},
Pods: &autoscaling.PodsMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
TargetAverageValue: *resource.NewMilliQuantity(100, resource.DecimalSI),
},
},
......@@ -742,7 +768,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
},
autoscaling.PodsMetricSourceType: {
Pods: &autoscaling.PodsMetricSource{
MetricName: "some/metric",
MetricName: "somemetric",
TargetAverageValue: *resource.NewMilliQuantity(100, resource.DecimalSI),
},
},
......@@ -752,7 +778,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
Kind: "ReplicationController",
Name: "myrc",
},
MetricName: "some/metric",
MetricName: "somemetric",
TargetValue: *resource.NewMilliQuantity(100, resource.DecimalSI),
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment