Skip to content

Validate networking annotations on RevisionTemplateSpec #16296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linkvt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Validate networking annotations on RevisionTemplateSpec #16296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/apis/serving/v1/revision_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/validation"
"knative.dev/networking/pkg/apis/networking"
"knative.dev/pkg/apis"
"knative.dev/pkg/kmap"
"knative.dev/pkg/kmp"
Expand Down Expand Up @@ -66,6 +67,7 @@ func (rts *RevisionTemplateSpec) Validate(ctx context.Context) *apis.FieldError
errs := rts.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec")
errs = errs.Also(autoscaling.ValidateAnnotations(ctx, config.FromContextOrDefaults(ctx).Autoscaler,
rts.GetAnnotations()).ViaField("metadata.annotations"))
errs = errs.Also(networking.ValidateAnnotations(rts.GetAnnotations()).ViaField("metadata.annotations"))

// If the RevisionTemplateSpec has a name specified, then check that
// it follows the requirements on the name.
Expand Down
51 changes: 51 additions & 0 deletions pkg/apis/serving/v1/revision_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,57 @@ func TestRevisionTemplateSpecValidation(t *testing.T) {
Message: "progress-deadline=-1m3s must be positive",
Paths: []string{serving.ProgressDeadlineAnnotationKey},
}).ViaField("metadata.annotations"),
}, {
name: "invalid networking.knative.dev/visibility annotation",
rts: &RevisionTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"networking.knative.dev/visibility": "cluster-local",
},
},
Spec: RevisionSpec{
PodSpec: corev1.PodSpec{
Containers: []corev1.Container{{
Image: "helloworld",
}},
},
},
},
want: apis.ErrInvalidKeyName("networking.knative.dev/visibility", "metadata.annotations"),
}, {
name: "invalid unknown networking.knative.dev annotation",
rts: &RevisionTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"networking.knative.dev/foo": "bar",
},
},
Spec: RevisionSpec{
PodSpec: corev1.PodSpec{
Containers: []corev1.Container{{
Image: "helloworld",
}},
},
},
},
want: apis.ErrInvalidKeyName("networking.knative.dev/foo", "metadata.annotations"),
}, {
name: "valid networking.knative.dev/ingress.class annotation",
rts: &RevisionTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
"networking.knative.dev/ingress.class": "istio.ingress.networking.knative.dev",
},
},
Spec: RevisionSpec{
PodSpec: corev1.PodSpec{
Containers: []corev1.Container{{
Image: "helloworld",
}},
},
},
},
want: nil,
}}

for _, test := range tests {
Expand Down
Loading