chore: re-generate specs and boilerplate code for newly introduced Tr…

…afficRouting.ALB.ServicePorts Signed-off-by: Armen Shakhbazian <armen.shakhbazian@gmail.com>
argoproj · May 6, 2024 · ecb0897 · ecb0897
1 parent 517ffe2
commit ecb0897
Show file tree

Hide file tree

Showing 9 changed files with 1,142 additions and 660 deletions.
diff --git a/manifests/crds/rollout-crd.yaml b/manifests/crds/rollout-crd.yaml
@@ -763,6 +763,21 @@ spec:
                               servicePort:
                                 format: int32
                                 type: integer
+                              servicePorts:
+                                items:
+                                  properties:
+                                    ingress:
+                                      type: string
+                                    servicePorts:
+                                      items:
+                                        format: int32
+                                        type: integer
+                                      type: array
+                                  required:
+                                  - ingress
+                                  - servicePorts
+                                  type: object
+                                type: array
                               stickinessConfig:
                                 properties:
                                   durationSeconds:
@@ -774,8 +789,6 @@ spec:
                                 - durationSeconds
                                 - enabled
                                 type: object
-                            required:
-                            - servicePort
                             type: object
                           ambassador:
                             properties:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -13253,6 +13253,21 @@ spec:
                               servicePort:
                                 format: int32
                                 type: integer
+                              servicePorts:
+                                items:
+                                  properties:
+                                    ingress:
+                                      type: string
+                                    servicePorts:
+                                      items:
+                                        format: int32
+                                        type: integer
+                                      type: array
+                                  required:
+                                  - ingress
+                                  - servicePorts
+                                  type: object
+                                type: array
                               stickinessConfig:
                                 properties:
                                   durationSeconds:
@@ -13264,8 +13279,6 @@ spec:
                                 - durationSeconds
                                 - enabled
                                 type: object
-                            required:
-                            - servicePort
                             type: object
                           ambassador:
                             properties:

diff --git a/pkg/apiclient/rollout/rollout.swagger.json b/pkg/apiclient/rollout/rollout.swagger.json
@@ -496,6 +496,23 @@
     }
   },
   "definitions": {
+    "github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.ALBIngressWithPorts": {
+      "type": "object",
+      "properties": {
+        "ingress": {
+          "type": "string",
+          "title": "Ingress specifies name of the ingress ServicePorts refer to"
+        },
+        "servicePorts": {
+          "type": "array",
+          "items": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "title": "ServicePorts define list of ports to be set for the ingress"
+        }
+      }
+    },
     "github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.ALBStatus": {
       "type": "object",
       "properties": {
@@ -523,7 +540,7 @@
         "servicePort": {
           "type": "integer",
           "format": "int32",
-          "title": "ServicePort refers to the port that the Ingress action should route traffic to"
+          "title": "ServicePort refers to the port that the Ingress action should route traffic to.\nCan be omitted if ports for each Ingress from .Ingresses list specified via ServicePorts\n+optional"
         },
         "rootService": {
           "type": "string",
@@ -543,6 +560,13 @@
             "type": "string"
           },
           "title": "Ingresses refers to the name of an `Ingress` resource in the same namespace as the `Rollout` in a multi ingress scenario\n+optional"
+        },
+        "servicePorts": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.ALBIngressWithPorts"
+          },
+          "title": "ServicePorts define ports for ingresses in a multi ingress scenario,\nin cases when when ingress has multiple ports or has port different from specified servicePort\n+optional"
         }
       },
       "title": "ALBTrafficRouting configuration for ALB ingress controller to control traffic routing"

diff --git a/pkg/apis/api-rules/violation_exceptions.list b/pkg/apis/api-rules/violation_exceptions.list
@@ -1,4 +1,6 @@
+API rule violation: list_type_missing,github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1,ALBIngressWithPorts,ServicePorts
 API rule violation: list_type_missing,github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1,ALBTrafficRouting,Ingresses
+API rule violation: list_type_missing,github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1,ALBTrafficRouting,ServicePorts
 API rule violation: list_type_missing,github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1,AmbassadorTrafficRouting,Mappings
 API rule violation: list_type_missing,github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1,AnalysisRunSpec,Args
 API rule violation: list_type_missing,github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1,AnalysisRunSpec,DryRun