Skip to content

Return TypeMeta as part of the conversion response #1433

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

Merged
knative-prow-robot merged 1 commit into from
Jun 22, 2020
Merged

Return TypeMeta as part of the conversion response #1433

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
4 changes: 4 additions & 0 deletions webhook/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ func conversionHandler(rootLogger *zap.SugaredLogger, stats StatsReporter, c Con

ctx := logging.WithLogger(r.Context(), logger)
response := apixv1.ConversionReview{
// Use the same type meta as the request - this is required by the K8s API
// note: v1beta1 & v1 ConversionReview shapes are identical so even though
// we're using v1 types we still support v1beta1 conversion requests
TypeMeta: review.TypeMeta,
Response: c.Convert(ctx, review.Request),
}

Expand Down
5 changes: 5 additions & 0 deletions webhook/conversion_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"net/http"
"testing"

"github.com/google/go-cmp/cmp"
"golang.org/x/sync/errgroup"
apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -136,6 +137,10 @@ func TestConversionValidResponse(t *testing.T) {
if reviewResponse.Response.UID != "some-uid" {
t.Errorf("expected the response uid to be the stubbed version")
}

if diff := cmp.Diff(review.TypeMeta, reviewResponse.TypeMeta); diff != "" {
t.Errorf("expected the response typeMeta to be the same as the request (-want, +got)\n%s", diff)
}
}

func TestConversionInvalidResponse(t *testing.T) {
Expand Down