use marker to annotate presered unnknown field (#197)

YCShen1010 · web-flow · commit 30e66e340420 · 2022-10-25T05:05:11.000+08:00
Signed-off-by: YCShen1010 &lt;yuchen.shen@mail.utoronto.ca&gt;

Signed-off-by: YCShen1010 &lt;yuchen.shen@mail.utoronto.ca&gt;
diff --git a/api/v1/namespacescope_types.go b/api/v1/namespacescope_types.go
@@ -67,6 +67,7 @@ type NamespaceScope struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Spec   NamespaceScopeSpec   `json:"spec,omitempty"`
 	Status NamespaceScopeStatus `json:"status,omitempty"`
 }
diff --git a/bundle-restricted/manifests/operator.ibm.com_namespacescopes.yaml b/bundle-restricted/manifests/operator.ibm.com_namespacescopes.yaml
@@ -34,7 +34,6 @@ spec:
           metadata:
             type: object
           spec:
-            x-kubernetes-preserve-unknown-fields: true
             description: NamespaceScopeSpec defines the desired state of NamespaceScope
             properties:
               configmapName:
@@ -76,6 +75,7 @@ spec:
                   type: string
                 type: array
             type: object
+            x-kubernetes-preserve-unknown-fields: true
           status:
             description: NamespaceScopeStatus defines the observed state of NamespaceScope
             properties:
diff --git a/bundle/manifests/operator.ibm.com_namespacescopes.yaml b/bundle/manifests/operator.ibm.com_namespacescopes.yaml
@@ -34,7 +34,6 @@ spec:
           metadata:
             type: object
           spec:
-            x-kubernetes-preserve-unknown-fields: true
             description: NamespaceScopeSpec defines the desired state of NamespaceScope
             properties:
               configmapName:
@@ -76,6 +75,7 @@ spec:
                   type: string
                 type: array
             type: object
+            x-kubernetes-preserve-unknown-fields: true
           status:
             description: NamespaceScopeStatus defines the observed state of NamespaceScope
             properties:
diff --git a/config/crd/bases/operator.ibm.com_namespacescopes.yaml b/config/crd/bases/operator.ibm.com_namespacescopes.yaml
@@ -32,7 +32,6 @@ spec:
           metadata:
             type: object
           spec:
-            x-kubernetes-preserve-unknown-fields: true
             description: NamespaceScopeSpec defines the desired state of NamespaceScope
             properties:
               configmapName:
@@ -66,6 +65,7 @@ spec:
                   type: string
                 type: array
             type: object
+            x-kubernetes-preserve-unknown-fields: true
           status:
             description: NamespaceScopeStatus defines the observed state of NamespaceScope
             properties:

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ type NamespaceScope struct {`
`67`	`67`	metav1.TypeMeta `json:",inline"`
`68`	`68`	metav1.ObjectMeta `json:"metadata,omitempty"`
`69`	`69`
	`70`	`+ // +kubebuilder:pruning:PreserveUnknownFields`
`70`	`71`	Spec NamespaceScopeSpec `json:"spec,omitempty"`
`71`	`72`	Status NamespaceScopeStatus `json:"status,omitempty"`
`72`	`73`	`}`