Merge pull request #2252 from ks-ci-bot/cherry-pick-2226-to-release-3.4

[release-3.4] fix: Gateway enable TCP/UPD traffic configuration prompt unknown field "tcp"
kubesphere · Oct 30, 2023 · d9812ad · d9812ad
2 parents b54fa28 + f30e412
commit d9812ad
Showing 1 changed file with 35 additions and 6 deletions.
diff --git a/roles/ks-core/ks-core/files/ks-core/crds/gateway.kubesphere.io_gateways.yaml b/roles/ks-core/ks-core/files/ks-core/crds/gateway.kubesphere.io_gateways.yaml
@@ -56,6 +56,14 @@ spec:
                       namespace:
                         type: string
                     type: object
+                  tcp:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  udp:
+                    additionalProperties:
+                      type: string
+                    type: object
                 type: object
               deployment:
                 properties:
@@ -66,6 +74,33 @@ spec:
                   replicas:
                     format: int32
                     type: integer
+                  resources:
+                    description: ResourceRequirements describes the compute resource
+                      requirements.
+                    properties:
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: 'Limits describes the maximum amount of compute
+                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: 'Requests describes the minimum amount of compute
+                          resources required. If Requests is omitted for a container,
+                          it defaults to Limits if that is explicitly specified, otherwise
+                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        type: object
+                    type: object
                 type: object
               service:
                 properties:
@@ -87,9 +122,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []