Merge pull request #2634 from Krishanx92/subscription-ratelimit

Remove unwanted types in CRDs
wso2 · Oct 28, 2024 · e0b93c7 · e0b93c7
2 parents a52aef4 + b2a716a
commit e0b93c7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 77 deletions.
diff --git a/helm-charts/crds/cp.wso2.com_subscriptions.yaml b/helm-charts/crds/cp.wso2.com_subscriptions.yaml
@@ -47,24 +47,11 @@ spec:
                 type: object
               organization:
                 type: string
-              ratelimitRef:
-                description: RatelimitRef defines the ratelimit associated with the
-                  subscription
-                properties:
-                  level:
-                    type: string
-                  name:
-                    type: string
-                required:
-                - level
-                - name
-                type: object
               subscriptionStatus:
                 type: string
             required:
             - api
             - organization
-            - ratelimitRef
             - subscriptionStatus
             type: object
           status:

diff --git a/helm-charts/crds/dp.wso2.com_ratelimitpolicies.yaml b/helm-charts/crds/dp.wso2.com_ratelimitpolicies.yaml
@@ -79,37 +79,6 @@ spec:
                         description: Value is the value of the custom policy
                         type: string
                     type: object
-                  subscription:
-                    description: Subscription level ratelimit policy
-                    properties:
-                      burstControl:
-                        description: BurstControl defines the rule for token count
-                          quota.
-                        properties:
-                          requestsPerUnit:
-                            format: int32
-                            type: integer
-                          unit:
-                            type: string
-                        type: object
-                      organization:
-                        type: string
-                      requestCount:
-                        description: RequestCount defines the rule for request count
-                          quota.
-                        properties:
-                          requestsPerUnit:
-                            format: int32
-                            type: integer
-                          unit:
-                            type: string
-                        type: object
-                      stopOnQuotaReach:
-                        type: boolean
-                    required:
-                    - organization
-                    - stopOnQuotaReach
-                    type: object
                 type: object
               override:
                 description: RateLimitAPIPolicy defines the desired state of Policy
@@ -156,37 +125,6 @@ spec:
                         description: Value is the value of the custom policy
                         type: string
                     type: object
-                  subscription:
-                    description: Subscription level ratelimit policy
-                    properties:
-                      burstControl:
-                        description: BurstControl defines the rule for token count
-                          quota.
-                        properties:
-                          requestsPerUnit:
-                            format: int32
-                            type: integer
-                          unit:
-                            type: string
-                        type: object
-                      organization:
-                        type: string
-                      requestCount:
-                        description: RequestCount defines the rule for request count
-                          quota.
-                        properties:
-                          requestsPerUnit:
-                            format: int32
-                            type: integer
-                          unit:
-                            type: string
-                        type: object
-                      stopOnQuotaReach:
-                        type: boolean
-                    required:
-                    - organization
-                    - stopOnQuotaReach
-                    type: object
                 type: object
               targetRef:
                 description: NamespacedPolicyTargetReference identifies an API object

diff --git a/test/cucumber-tests/CRs/artifacts.yaml b/test/cucumber-tests/CRs/artifacts.yaml
@@ -900,7 +900,7 @@ data:
     u0/ITEw=
     -----END CERTIFICATE-----
 ---
-apiVersion: cp.wso2.com/v1alpha2
+apiVersion: cp.wso2.com/v1alpha3
 kind: Subscription
 metadata:
   name: semantic-versioning-subscription
@@ -1385,7 +1385,7 @@ spec:
       in: "Body"
       value: "usage.total_tokens"
 ---
-apiVersion: cp.wso2.com/v1alpha2
+apiVersion: cp.wso2.com/v1alpha3
 kind: Subscription
 metadata:
   name: llm-subs