Merge pull request #2279 from pubudu538/cc-redis

Add enabled flag for the CORs policy
wso2 · Apr 5, 2024 · e53299f · e53299f
2 parents 1e180d5 + 7cedb27
commit e53299f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go b/common-go-libs/apis/dp/v1alpha2/apipolicy_types.go
@@ -71,6 +71,13 @@ type BackendJWTToken struct {
 
 // CORSPolicy holds CORS policy information
 type CORSPolicy struct {
+
+	// Enabled is to enable CORs policy for the API.
+	//
+	// +kubebuilder:default=true
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
+
 	// AllowCredentials indicates whether the request can include user credentials like
 	// cookies, HTTP authentication or client side SSL certificates.
 	//

diff --git a/common-go-libs/config/crd/bases/dp.wso2.com_apipolicies.yaml b/common-go-libs/config/crd/bases/dp.wso2.com_apipolicies.yaml
@@ -320,6 +320,10 @@ spec:
                           of a preflight request can be cached in a preflight result
                           cache.
                         type: integer
+                      enabled:
+                        default: true
+                        description: Enabled is to enable CORs policy for the API.
+                        type: boolean
                     type: object
                   requestInterceptors:
                     description: RequestInterceptors referenced to intercetor services
@@ -410,6 +414,10 @@ spec:
                           of a preflight request can be cached in a preflight result
                           cache.
                         type: integer
+                      enabled:
+                        default: true
+                        description: Enabled is to enable CORs policy for the API.
+                        type: boolean
                     type: object
                   requestInterceptors:
                     description: RequestInterceptors referenced to intercetor services

diff --git a/helm-charts/crds/dp.wso2.com_apipolicies.yaml b/helm-charts/crds/dp.wso2.com_apipolicies.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: apipolicies.dp.wso2.com
 spec:
   group: dp.wso2.com
@@ -207,10 +206,11 @@ spec:
                 type: object
               targetRef:
                 description: PolicyTargetReference identifies an API object to apply
-                  policy to. This should be used as part of Policy resources that
-                  can target Gateway API resources. For more information on how this
-                  policy attachment model works, and a sample Policy resource, refer
-                  to the policy attachment documentation for Gateway API.
+                  a direct or inherited policy to. This should be used as part of
+                  Policy resources that can target Gateway API resources. For more
+                  information on how this policy attachment model works, and a sample
+                  Policy resource, refer to the policy attachment documentation for
+                  Gateway API.
                 properties:
                   group:
                     description: Group is the group of the target resource.
@@ -320,6 +320,10 @@ spec:
                           of a preflight request can be cached in a preflight result
                           cache.
                         type: integer
+                      enabled:
+                        default: true
+                        description: Enabled is to enable CORs policy for the API.
+                        type: boolean
                     type: object
                   requestInterceptors:
                     description: RequestInterceptors referenced to intercetor services
@@ -410,6 +414,10 @@ spec:
                           of a preflight request can be cached in a preflight result
                           cache.
                         type: integer
+                      enabled:
+                        default: true
+                        description: Enabled is to enable CORs policy for the API.
+                        type: boolean
                     type: object
                   requestInterceptors:
                     description: RequestInterceptors referenced to intercetor services
@@ -453,10 +461,11 @@ spec:
                 type: object
               targetRef:
                 description: PolicyTargetReference identifies an API object to apply
-                  policy to. This should be used as part of Policy resources that
-                  can target Gateway API resources. For more information on how this
-                  policy attachment model works, and a sample Policy resource, refer
-                  to the policy attachment documentation for Gateway API.
+                  a direct or inherited policy to. This should be used as part of
+                  Policy resources that can target Gateway API resources. For more
+                  information on how this policy attachment model works, and a sample
+                  Policy resource, refer to the policy attachment documentation for
+                  Gateway API.
                 properties:
                   group:
                     description: Group is the group of the target resource.