fix: yet more types

Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
pluralsh · Jul 14, 2023 · d7dbdaa · d7dbdaa
1 parent beb7949
commit d7dbdaa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/api/observability/v1alpha1/tempo_limit_types.go b/api/observability/v1alpha1/tempo_limit_types.go
@@ -171,14 +171,12 @@ type PolicyMatch struct {
 }
 
 type MatchPolicyAttribute struct {
-	// +kubebuilder:validation:Optional
-	Key *string `yaml:"key,omitempty" json:"key,omitempty"`
+	Key string `yaml:"key" json:"key"`
 
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:validation:Type=object
-	Value *WrappedMap `yaml:"value,omitempty" json:"value,omitempty"`
+	Value WrappedMap `yaml:"value" json:"value"`
 }
 
 type WrappedMap struct {

diff --git a/api/observability/v1alpha1/zz_generated.deepcopy.go b/api/observability/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/observability.traceshield.io_tenants.yaml b/config/crd/bases/observability.traceshield.io_tenants.yaml
@@ -1091,6 +1091,9 @@ spec:
                                       value:
                                         type: object
                                         x-kubernetes-preserve-unknown-fields: true
+                                    required:
+                                    - key
+                                    - value
                                     type: object
                                   type: array
                                 match_type:
@@ -1109,6 +1112,9 @@ spec:
                                       value:
                                         type: object
                                         x-kubernetes-preserve-unknown-fields: true
+                                    required:
+                                    - key
+                                    - value
                                     type: object
                                   type: array
                                 match_type: