knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return TypeMeta as part of the conversion response (#1433) 

This is a requirement when adopting CRD v1 APIs
This commit is contained in:
Dave Protasowski 2020-06-22 11:29:27 -04:00 committed by GitHub
parent f0da4c9b6e
commit 02c28cd5ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webhook/conversion.go
View File

@ -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),
}

5
webhook/conversion_integration_test.go
View File

@ -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"
@ -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) {