Add preserve unknown fields annotation to FreeForm and Option fields

Signed-off-by: Ruben Vargas <[email protected]>
jaegertracing · May 17, 2021 · 29af842 · 29af842
1 parent 7968e96
commit 29af842
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/deploy/crds/jaegertracing.io_jaegers_crd.yaml b/deploy/crds/jaegertracing.io_jaegers_crd.yaml
@@ -580,6 +580,7 @@ spec:
                   type: object
                 config:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 dnsPolicy:
                   type: string
                 hostNetwork:
@@ -600,6 +601,7 @@ spec:
                   type: object
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 priorityClassName:
                   type: string
                 resources:
@@ -1633,6 +1635,7 @@ spec:
                   type: object
                 config:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 image:
                   type: string
                 labels:
@@ -1641,6 +1644,7 @@ spec:
                   type: object
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 resources:
                   nullable: true
                   properties:
@@ -2629,6 +2633,7 @@ spec:
                   type: boolean
                 config:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 image:
                   type: string
                 labels:
@@ -2643,6 +2648,7 @@ spec:
                   type: integer
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 priorityClassName:
                   type: string
                 replicas:
@@ -3631,6 +3637,7 @@ spec:
                   type: boolean
                 config:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 image:
                   type: string
                 labels:
@@ -3645,6 +3652,7 @@ spec:
                   type: integer
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 replicas:
                   format: int32
                   type: integer
@@ -4649,6 +4657,7 @@ spec:
                   type: object
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 resources:
                   nullable: true
                   properties:
@@ -5658,6 +5667,7 @@ spec:
                   type: integer
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 priorityClassName:
                   type: string
                 replicas:
@@ -6399,6 +6409,7 @@ spec:
               properties:
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
               type: object
             securityContext:
               properties:
@@ -9531,6 +9542,7 @@ spec:
                   type: object
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 secretName:
                   type: string
                 type:
@@ -9559,6 +9571,7 @@ spec:
               properties:
                 options:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
               type: object
             volumeMounts:
               items:

diff --git a/pkg/apis/jaegertracing/v1/jaeger_types.go b/pkg/apis/jaegertracing/v1/jaeger_types.go
@@ -240,6 +240,7 @@ type JaegerQuerySpec struct {
 	Image string `json:"image,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 
 	// +optional
@@ -270,13 +271,15 @@ type JaegerQuerySpec struct {
 // +k8s:openapi-gen=true
 type JaegerUISpec struct {
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options FreeForm `json:"options,omitempty"`
 }
 
 // JaegerSamplingSpec defines the options to be used to configure the UI
 // +k8s:openapi-gen=true
 type JaegerSamplingSpec struct {
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options FreeForm `json:"options,omitempty"`
 }
 
@@ -308,6 +311,7 @@ type JaegerIngressSpec struct {
 	JaegerCommonSpec `json:",inline,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 }
 
@@ -347,9 +351,11 @@ type JaegerAllInOneSpec struct {
 	Image string `json:"image,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Config FreeForm `json:"config,omitempty"`
 
 	// +optional
@@ -392,12 +398,14 @@ type JaegerCollectorSpec struct {
 	Image string `json:"image,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 
 	// +optional
 	JaegerCommonSpec `json:",inline,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Config FreeForm `json:"config,omitempty"`
 
 	// +optional
@@ -425,12 +433,14 @@ type JaegerIngesterSpec struct {
 	Image string `json:"image,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 
 	// +optional
 	JaegerCommonSpec `json:",inline,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Config FreeForm `json:"config,omitempty"`
 }
 
@@ -449,12 +459,14 @@ type JaegerAgentSpec struct {
 	ImagePullSecrets []v1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 
 	// +optional
 	JaegerCommonSpec `json:",inline,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Config FreeForm `json:"config,omitempty"`
 
 	// +optional
@@ -480,6 +492,7 @@ type JaegerStorageSpec struct {
 	SecretName string `json:"secretName,omitempty"`
 
 	// +optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	Options Options `json:"options,omitempty"`
 
 	// +optional