fix: remove deprecated spec.preserveUnknownFields and update frameworks

meskinemohamed · meskinemohamed · commit 8237e883e8cc · 2025-12-12T16:47:06.000+01:00
- Remove preserveUnknownFields from all CRD definitions (deprecated in k8s 1.16+) - Remove config/crd/patches/preserve_unknown_fields_false.yaml patch file - Remove patch reference from config/crd/kustomization.yaml - Update kubebuilder annotations from +kubebuilder:validation:XPreserveUnknownFields to +kubebuilder:pruning:PreserveUnknownFields per KubeBuilder docs - Update frameworks/constraint to use fork with fix for regenerated manifests - Regenerate manifests Fixes #3996 Signed-off-by: meskinemohamed <mohamed.meskine@dataiku.com>
diff --git a/apis/connection/v1alpha1/connection_types.go b/apis/connection/v1alpha1/connection_types.go
@@ -31,7 +31,7 @@ type ConnectionSpec struct {
 	Driver string `json:"driver"`
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Schemaless
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Config *types.Anything `json:"config"`
 }
 
diff --git a/apis/mutations/unversioned/modifyset_types.go b/apis/mutations/unversioned/modifyset_types.go
@@ -60,7 +60,7 @@ type ModifySetParameters struct {
 	// Values describes the values provided to the operation as `values.fromList`.
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:validation:Type=object
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Values Values `json:"values,omitempty"`
 }
 
diff --git a/apis/mutations/unversioned/value.go b/apis/mutations/unversioned/value.go
@@ -31,7 +31,7 @@ var validFields = map[Field]bool{
 type AssignField struct {
 	// Value is a constant value that will be assigned to `location`
 	// +kubebuilder:validation:Schemaless
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Value *types.Anything `json:"value,omitempty"`
 
 	// FromMetadata assigns a value from the specified metadata field.
diff --git a/apis/mutations/v1/modifyset_types.go b/apis/mutations/v1/modifyset_types.go
@@ -60,7 +60,7 @@ type ModifySetParameters struct {
 	// Values describes the values provided to the operation as `values.fromList`.
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:validation:Type=object
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Values Values `json:"values,omitempty"`
 }
 
diff --git a/apis/mutations/v1/value.go b/apis/mutations/v1/value.go
@@ -8,7 +8,7 @@ import (
 type AssignField struct {
 	// Value is a constant value that will be assigned to `location`
 	// +kubebuilder:validation:Schemaless
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Value *types.Anything `json:"value,omitempty"`
 
 	// FromMetadata assigns a value from the specified metadata field.
diff --git a/apis/mutations/v1alpha1/modifyset_types.go b/apis/mutations/v1alpha1/modifyset_types.go
@@ -60,7 +60,7 @@ type ModifySetParameters struct {
 	// Values describes the values provided to the operation as `values.fromList`.
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:validation:Type=object
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Values Values `json:"values,omitempty"`
 }
 
diff --git a/apis/mutations/v1alpha1/value.go b/apis/mutations/v1alpha1/value.go
@@ -8,7 +8,7 @@ import (
 type AssignField struct {
 	// Value is a constant value that will be assigned to `location`
 	// +kubebuilder:validation:Schemaless
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Value *types.Anything `json:"value,omitempty"`
 
 	// FromMetadata assigns a value from the specified metadata field.
diff --git a/apis/mutations/v1beta1/modifyset_types.go b/apis/mutations/v1beta1/modifyset_types.go
@@ -60,7 +60,7 @@ type ModifySetParameters struct {
 	// Values describes the values provided to the operation as `values.fromList`.
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:validation:Type=object
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Values Values `json:"values,omitempty"`
 }
 
diff --git a/apis/mutations/v1beta1/value.go b/apis/mutations/v1beta1/value.go
@@ -8,7 +8,7 @@ import (
 type AssignField struct {
 	// Value is a constant value that will be assigned to `location`
 	// +kubebuilder:validation:Schemaless
-	// +kubebuilder:validation:XPreserveUnknownFields
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Value *types.Anything `json:"value,omitempty"`
 
 	// FromMetadata assigns a value from the specified metadata field.
diff --git a/config/crd/bases/constrainttemplate-customresourcedefinition.yaml b/config/crd/bases/constrainttemplate-customresourcedefinition.yaml
@@ -11,7 +11,6 @@ spec:
     listKind: ConstraintTemplateList
     plural: constrainttemplates
     singular: constrainttemplate
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -20,13 +20,6 @@ resources:
 - bases/constrainttemplate-customresourcedefinition.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patches:
-- target:
-    group: apiextensions.k8s.io
-    version: v1
-    kind: CustomResourceDefinition
-  path: patches/preserve_unknown_fields_false.yaml
-
 patchesJson6902:
 - target:
     group: apiextensions.k8s.io
diff --git a/config/crd/patches/preserve_unknown_fields_false.yaml b/config/crd/patches/preserve_unknown_fields_false.yaml
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/onsi/gomega v1.38.2
 	github.com/open-policy-agent/cert-controller v0.14.1-0.20251031183427-40974f7dd486
-	github.com/open-policy-agent/frameworks/constraint v0.0.0-20251105220536-241c4a079fc8
+	github.com/open-policy-agent/frameworks/constraint v0.0.0-20251212003702-cf69624a8e54
 	github.com/open-policy-agent/opa v1.10.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.23.2
diff --git a/go.sum b/go.sum
@@ -305,8 +305,8 @@ github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
 github.com/open-policy-agent/cert-controller v0.14.1-0.20251031183427-40974f7dd486 h1:Ir1VtwXM/0OF22+klrZQpqbJQ4Vkpv1v4d7p61Xpzyg=
 github.com/open-policy-agent/cert-controller v0.14.1-0.20251031183427-40974f7dd486/go.mod h1:6zxrUxL0sFlTQzNFToeo2ysfQ9lloVXj2fitZBVdXWU=
-github.com/open-policy-agent/frameworks/constraint v0.0.0-20251105220536-241c4a079fc8 h1:vb+BOrLjcuBfmULbcnHG3rWSbivfN4J3gMVIgLDnHwE=
-github.com/open-policy-agent/frameworks/constraint v0.0.0-20251105220536-241c4a079fc8/go.mod h1:xe7Oq8yotFEBBx9dmlFQtlJamC7ULIwd8bUimWrnjlQ=
+github.com/open-policy-agent/frameworks/constraint v0.0.0-20251212003702-cf69624a8e54 h1:lpHoyrcCmdhtVIdg7hz5wK1zR1HaGsBrWA5ddTgK7qc=
+github.com/open-policy-agent/frameworks/constraint v0.0.0-20251212003702-cf69624a8e54/go.mod h1:ZijN1cmV6XtRWHEWVSq/nWwa3ZAoO3d9OlfGsocbCsY=
 github.com/open-policy-agent/opa v1.10.0 h1:CzWR/2OhZ5yHrqiyyB1Z37mqLMowifAiFSasjLxBBpk=
 github.com/open-policy-agent/opa v1.10.0/go.mod h1:7uPI3iRpOalJ0BhK6s1JALWPU9HvaV1XeBSSMZnr/PM=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
diff --git a/manifest_staging/charts/gatekeeper/crds/assign-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/assign-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: AssignList
     plural: assign
     singular: assign
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1
diff --git a/manifest_staging/charts/gatekeeper/crds/assignimage-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/assignimage-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: AssignImageList
     plural: assignimage
     singular: assignimage
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1alpha1
diff --git a/manifest_staging/charts/gatekeeper/crds/assignmetadata-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/assignmetadata-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: AssignMetadataList
     plural: assignmetadata
     singular: assignmetadata
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1
diff --git a/manifest_staging/charts/gatekeeper/crds/config-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/config-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConfigList
     plural: configs
     singular: config
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1alpha1
diff --git a/manifest_staging/charts/gatekeeper/crds/configpodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/configpodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConfigPodStatusList
     plural: configpodstatuses
     singular: configpodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
diff --git a/manifest_staging/charts/gatekeeper/crds/connection-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/connection-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConnectionList
     plural: connections
     singular: connection
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1alpha1
diff --git a/manifest_staging/charts/gatekeeper/crds/connectionpodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/connectionpodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConnectionPodStatusList
     plural: connectionpodstatuses
     singular: connectionpodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1alpha1
diff --git a/manifest_staging/charts/gatekeeper/crds/constraintpodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/constraintpodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConstraintPodStatusList
     plural: constraintpodstatuses
     singular: constraintpodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
diff --git a/manifest_staging/charts/gatekeeper/crds/constrainttemplate-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/constrainttemplate-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConstraintTemplateList
     plural: constrainttemplates
     singular: constrainttemplate
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1
diff --git a/manifest_staging/charts/gatekeeper/crds/constrainttemplatepodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/constrainttemplatepodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ConstraintTemplatePodStatusList
     plural: constrainttemplatepodstatuses
     singular: constrainttemplatepodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
diff --git a/manifest_staging/charts/gatekeeper/crds/expansiontemplate-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/expansiontemplate-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ExpansionTemplateList
     plural: expansiontemplate
     singular: expansiontemplate
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1alpha1
diff --git a/manifest_staging/charts/gatekeeper/crds/expansiontemplatepodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/expansiontemplatepodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ExpansionTemplatePodStatusList
     plural: expansiontemplatepodstatuses
     singular: expansiontemplatepodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
diff --git a/manifest_staging/charts/gatekeeper/crds/modifyset-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/modifyset-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ModifySetList
     plural: modifyset
     singular: modifyset
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1
diff --git a/manifest_staging/charts/gatekeeper/crds/mutatorpodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/mutatorpodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: MutatorPodStatusList
     plural: mutatorpodstatuses
     singular: mutatorpodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
diff --git a/manifest_staging/charts/gatekeeper/crds/provider-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/provider-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ProviderList
     plural: providers
     singular: provider
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - deprecated: true
diff --git a/manifest_staging/charts/gatekeeper/crds/providerpodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/providerpodstatus-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: ProviderPodStatusList
     plural: providerpodstatuses
     singular: providerpodstatus
-  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - name: v1beta1
diff --git a/manifest_staging/charts/gatekeeper/crds/syncset-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/syncset-customresourcedefinition.yaml
@@ -14,7 +14,6 @@ spec:
     listKind: SyncSetList
     plural: syncsets
     singular: syncset
-  preserveUnknownFields: false
   scope: Cluster
   versions:
   - name: v1alpha1
diff --git a/manifest_staging/deploy/gatekeeper.yaml b/manifest_staging/deploy/gatekeeper.yaml

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ type ConnectionSpec struct {`
`31`	`31`	Driver string `json:"driver"`
`32`	`32`	`// +kubebuilder:validation:Required`
`33`	`33`	`// +kubebuilder:validation:Schemaless`
`34`		`- // +kubebuilder:validation:XPreserveUnknownFields`
	`34`	`+ // +kubebuilder:pruning:PreserveUnknownFields`
`35`	`35`	Config *types.Anything `json:"config"`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ type ModifySetParameters struct {`
`60`	`60`	// Values describes the values provided to the operation as `values.fromList`.
`61`	`61`	`// +kubebuilder:validation:Schemaless`
`62`	`62`	`// +kubebuilder:validation:Type=object`
`63`		`- // +kubebuilder:validation:XPreserveUnknownFields`
	`63`	`+ // +kubebuilder:pruning:PreserveUnknownFields`
`64`	`64`	Values Values `json:"values,omitempty"`
`65`	`65`	`}`
`66`	`66`