From 9f15cd2721a90190be3bf83eb9b1cec35ecc5e81 Mon Sep 17 00:00:00 2001 From: Satish Matti Date: Wed, 6 May 2020 10:37:30 -0700 Subject: [PATCH] Enable pruning of unknown fields for CRDs --- pkg/backendconfig/backendconfig.go | 1 + pkg/crd/crd.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/pkg/backendconfig/backendconfig.go b/pkg/backendconfig/backendconfig.go index f10cd9970e..b093eeffb4 100644 --- a/pkg/backendconfig/backendconfig.go +++ b/pkg/backendconfig/backendconfig.go @@ -43,6 +43,7 @@ func CRDMeta() *crd.CRDMeta { "BackendConfigList", "backendconfig", "backendconfigs", + "bc", ) meta.AddValidationInfo("k8s.io/ingress-gce/pkg/apis/backendconfig/v1.BackendConfig", backendconfigv1.GetOpenAPIDefinitions) return meta diff --git a/pkg/crd/crd.go b/pkg/crd/crd.go index ff01761064..2f0d1f4a8b 100644 --- a/pkg/crd/crd.go +++ b/pkg/crd/crd.go @@ -27,6 +27,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" + utilpointer "k8s.io/utils/pointer" ) const ( @@ -118,6 +119,9 @@ func crd(meta *CRDMeta) *apiextensionsv1beta1.CustomResourceDefinition { klog.Errorf("Error adding simple validation for %v CRD: %v", meta.kind, err) } crd.Spec.Validation = validationSpec + // Drop unknown fields of a CRD resource. Note that this needs be specified + // in conjunction with validation spec. + crd.Spec.PreserveUnknownFields = utilpointer.BoolPtr(false) } return crd }