feat(meshmultizoneservice): require ports (#10984)

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
kumahq · Jul 26, 2024 · 52c4076 · 52c4076
1 parent 0596b17
commit 52c4076
Show file tree

Hide file tree

Showing 24 changed files with 258 additions and 252 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -3739,6 +3739,29 @@ spec:
             description: Spec is the specification of the Kuma MeshMultiZoneService
               resource.
             properties:
+              ports:
+                description: Ports is a list of ports from selected MeshServices
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
+                  required:
+                  - port
+                  type: object
+                minItems: 1
+                type: array
               selector:
                 description: Selector is a way to select multiple MeshServices
                 properties:
@@ -3856,29 +3879,6 @@ spec:
                   - name
                   type: object
                 type: array
-              ports:
-                description: Ports is an aggregated distinct list of ports from selected
-                  MeshServices
-                items:
-                  properties:
-                    appProtocol:
-                      default: tcp
-                      description: Protocol identifies a protocol supported by a service.
-                      type: string
-                    name:
-                      type: string
-                    port:
-                      format: int32
-                      type: integer
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      x-kubernetes-int-or-string: true
-                  required:
-                  - port
-                  type: object
-                type: array
               vips:
                 description: VIPs is a list of assigned Kuma VIPs.
                 items:

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
@@ -3739,6 +3739,29 @@ spec:
             description: Spec is the specification of the Kuma MeshMultiZoneService
               resource.
             properties:
+              ports:
+                description: Ports is a list of ports from selected MeshServices
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
+                  required:
+                  - port
+                  type: object
+                minItems: 1
+                type: array
               selector:
                 description: Selector is a way to select multiple MeshServices
                 properties:
@@ -3856,29 +3879,6 @@ spec:
                   - name
                   type: object
                 type: array
-              ports:
-                description: Ports is an aggregated distinct list of ports from selected
-                  MeshServices
-                items:
-                  properties:
-                    appProtocol:
-                      default: tcp
-                      description: Protocol identifies a protocol supported by a service.
-                      type: string
-                    name:
-                      type: string
-                    port:
-                      format: int32
-                      type: integer
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      x-kubernetes-int-or-string: true
-                  required:
-                  - port
-                  type: object
-                type: array
               vips:
                 description: VIPs is a list of assigned Kuma VIPs.
                 items:

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
@@ -3759,6 +3759,29 @@ spec:
             description: Spec is the specification of the Kuma MeshMultiZoneService
               resource.
             properties:
+              ports:
+                description: Ports is a list of ports from selected MeshServices
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
+                  required:
+                  - port
+                  type: object
+                minItems: 1
+                type: array
               selector:
                 description: Selector is a way to select multiple MeshServices
                 properties:
@@ -3876,29 +3899,6 @@ spec:
                   - name
                   type: object
                 type: array
-              ports:
-                description: Ports is an aggregated distinct list of ports from selected
-                  MeshServices
-                items:
-                  properties:
-                    appProtocol:
-                      default: tcp
-                      description: Protocol identifies a protocol supported by a service.
-                      type: string
-                    name:
-                      type: string
-                    port:
-                      format: int32
-                      type: integer
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      x-kubernetes-int-or-string: true
-                  required:
-                  - port
-                  type: object
-                type: array
               vips:
                 description: VIPs is a list of assigned Kuma VIPs.
                 items:

diff --git a/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml b/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
@@ -5293,6 +5293,29 @@ spec:
             description: Spec is the specification of the Kuma MeshMultiZoneService
               resource.
             properties:
+              ports:
+                description: Ports is a list of ports from selected MeshServices
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
+                  required:
+                  - port
+                  type: object
+                minItems: 1
+                type: array
               selector:
                 description: Selector is a way to select multiple MeshServices
                 properties:
@@ -5410,29 +5433,6 @@ spec:
                   - name
                   type: object
                 type: array
-              ports:
-                description: Ports is an aggregated distinct list of ports from selected
-                  MeshServices
-                items:
-                  properties:
-                    appProtocol:
-                      default: tcp
-                      description: Protocol identifies a protocol supported by a service.
-                      type: string
-                    name:
-                      type: string
-                    port:
-                      format: int32
-                      type: integer
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      x-kubernetes-int-or-string: true
-                  required:
-                  - port
-                  type: object
-                type: array
               vips:
                 description: VIPs is a list of assigned Kuma VIPs.
                 items:

diff --git a/deployments/charts/kuma/crds/kuma.io_meshmultizoneservices.yaml b/deployments/charts/kuma/crds/kuma.io_meshmultizoneservices.yaml
@@ -41,6 +41,29 @@ spec:
             description: Spec is the specification of the Kuma MeshMultiZoneService
               resource.
             properties:
+              ports:
+                description: Ports is a list of ports from selected MeshServices
+                items:
+                  properties:
+                    appProtocol:
+                      default: tcp
+                      description: Protocol identifies a protocol supported by a service.
+                      type: string
+                    name:
+                      type: string
+                    port:
+                      format: int32
+                      type: integer
+                    targetPort:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      x-kubernetes-int-or-string: true
+                  required:
+                  - port
+                  type: object
+                minItems: 1
+                type: array
               selector:
                 description: Selector is a way to select multiple MeshServices
                 properties:
@@ -158,29 +181,6 @@ spec:
                   - name
                   type: object
                 type: array
-              ports:
-                description: Ports is an aggregated distinct list of ports from selected
-                  MeshServices
-                items:
-                  properties:
-                    appProtocol:
-                      default: tcp
-                      description: Protocol identifies a protocol supported by a service.
-                      type: string
-                    name:
-                      type: string
-                    port:
-                      format: int32
-                      type: integer
-                    targetPort:
-                      anyOf:
-                      - type: integer
-                      - type: string
-                      x-kubernetes-int-or-string: true
-                  required:
-                  - port
-                  type: object
-                type: array
               vips:
                 description: VIPs is a list of assigned Kuma VIPs.
                 items:

diff --git a/docs/generated/openapi.yaml b/docs/generated/openapi.yaml
@@ -11107,6 +11107,29 @@ components:
         spec:
           description: Spec is the specification of the Kuma MeshMultiZoneService resource.
           properties:
+            ports:
+              description: Ports is a list of ports from selected MeshServices
+              items:
+                properties:
+                  appProtocol:
+                    default: tcp
+                    description: Protocol identifies a protocol supported by a service.
+                    type: string
+                  name:
+                    type: string
+                  port:
+                    format: int32
+                    type: integer
+                  targetPort:
+                    anyOf:
+                      - type: integer
+                      - type: string
+                    x-kubernetes-int-or-string: true
+                required:
+                  - port
+                type: object
+              minItems: 1
+              type: array
             selector:
               description: Selector is a way to select multiple MeshServices
               properties:
@@ -11244,30 +11267,6 @@ components:
                   - name
                 type: object
               type: array
-            ports:
-              description: >-
-                Ports is an aggregated distinct list of ports from selected
-                MeshServices
-              items:
-                properties:
-                  appProtocol:
-                    default: tcp
-                    description: Protocol identifies a protocol supported by a service.
-                    type: string
-                  name:
-                    type: string
-                  port:
-                    format: int32
-                    type: integer
-                  targetPort:
-                    anyOf:
-                      - type: integer
-                      - type: string
-                    x-kubernetes-int-or-string: true
-                required:
-                  - port
-                type: object
-              type: array
             vips:
               description: VIPs is a list of assigned Kuma VIPs.
               items: