manifests: update required oneOf conditions

Signed-off-by: KevFan <[email protected]>
Kuadrant · Oct 25, 2024 · adb07cf · adb07cf
1 parent a64198b
commit adb07cf
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -155,7 +155,7 @@ report-benchmarks:
 cover: ## Shows test coverage
 	go tool cover -html=cover.out
 
-AUTHCONFIG_VERSION ?= v1beta2
+AUTHCONFIG_VERSION ?= v1beta3
 VERBOSE ?= 0
 e2e: ## Runs the end-to-end tests on a local environment setup
 	$(MAKE) local-setup NAMESPACE=authorino KIND_CLUSTER_NAME=authorino-e2e AUTHORINO_IMAGE=$(AUTHORINO_IMAGE) TLS_ENABLED=$(TLS_ENABLED) OPERATOR_BRANCH=$(OPERATOR_BRANCH) AUTHORINO_MANIFESTS=$(AUTHORINO_MANIFESTS) AUTHORINO_INSTANCE=$(AUTHORINO_INSTANCE) ENVOY_OVERLAY=$(ENVOY_OVERLAY) DEPLOY_KEYCLOAK=1 FF=1

diff --git a/install/crd/patches/oneof_in_authconfigs.yaml b/install/crd/patches/oneof_in_authconfigs.yaml
@@ -319,6 +319,9 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
 
 - op: add
   path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/when/items/oneOf
@@ -337,6 +340,9 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
 
 - op: add
   path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/authentication/additionalProperties/properties/when/items/oneOf
@@ -355,6 +361,9 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
 
 - op: add
   path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/metadata/additionalProperties/properties/when/items/oneOf
@@ -373,6 +382,9 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
 
 - op: add
   path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/authorization/additionalProperties/properties/when/items/oneOf
@@ -391,6 +403,9 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
 
 - op: add
   path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/response/properties/success/properties/headers/additionalProperties/properties/when/items/oneOf
@@ -409,6 +424,9 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
 
 - op: add
   path: /spec/versions/1/schema/openAPIV3Schema/properties/spec/properties/response/properties/success/properties/dynamicMetadata/additionalProperties/properties/when/items/oneOf
@@ -427,3 +445,6 @@
     - properties:
         any: {}
       required: [any]
+    - properties:
+        predicate: {}
+      required: [predicate]
diff --git a/install/manifests.yaml b/install/manifests.yaml
@@ -2922,6 +2922,10 @@ spec:
                             any: {}
                           required:
                           - any
+                        - properties:
+                            predicate: {}
+                          required:
+                          - predicate
                         properties:
                           all:
                             description: A list of pattern expressions to be evaluated
@@ -3464,6 +3468,10 @@ spec:
                                 any: {}
                               required:
                               - any
+                            - properties:
+                                predicate: {}
+                              required:
+                              - predicate
                             properties:
                               all:
                                 description: A list of pattern expressions to be evaluated
@@ -3657,6 +3665,10 @@ spec:
                             any: {}
                           required:
                           - any
+                        - properties:
+                            predicate: {}
+                          required:
+                          - predicate
                         properties:
                           all:
                             description: A list of pattern expressions to be evaluated
@@ -4324,6 +4336,10 @@ spec:
                             any: {}
                           required:
                           - any
+                        - properties:
+                            predicate: {}
+                          required:
+                          - predicate
                         properties:
                           all:
                             description: A list of pattern expressions to be evaluated
@@ -4543,6 +4559,10 @@ spec:
                                     any: {}
                                   required:
                                   - any
+                                - properties:
+                                    predicate: {}
+                                  required:
+                                  - predicate
                                 properties:
                                   all:
                                     description: A list of pattern expressions to
@@ -4785,6 +4805,10 @@ spec:
                                     any: {}
                                   required:
                                   - any
+                                - properties:
+                                    predicate: {}
+                                  required:
+                                  - predicate
                                 properties:
                                   all:
                                     description: A list of pattern expressions to
@@ -5052,6 +5076,10 @@ spec:
                       any: {}
                     required:
                     - any
+                  - properties:
+                      predicate: {}
+                    required:
+                    - predicate
                   properties:
                     all:
                       description: A list of pattern expressions to be evaluated as