Adds possibility to define portRef for extra ingresses

nano-byte · May 10, 2024 · e2e430e · e2e430e
1 parent a0f0918
commit e2e430e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/charts/generic-service/README.md b/charts/generic-service/README.md
@@ -123,6 +123,7 @@ app:
 | `ingress.istio.retries`                         | `{}`                        | [Istio retry policy](https://istio.io/docs/reference/config/networking/virtual-service/#HTTPRetry)       |
 | `ingress.extra.*.class`                         | same as `ingress.class`     | Additional ingress controller to use (not applicable if `ingress.istio.enabled`)                         |
 | `ingress.extra.*.port`                          | same as `ingress.port`      | Additional container port ingress traffic is routed to (not applicable if `ingress.istio.enabled`)       |
+| `ingress.extra.*.portRef`                       |                             | Reference to the name of another extra ingress to share its container port                               |
 | `ingress.extra.*.protocol`                      | `http`                      | The protocol used for the port (e.g., `http`, `https`, `h2c`, `grpc`, `http2`/`h2` or `grpcs`)           |
 | `ingress.extra.*.timeoutSeconds`                |                             | Number of seconds after which to timeout waiting for response from service; -1 for infinite              |
 | `ingress.extra.*.domains`                       | `[]`                        | The public domain names under which the port is exposed (leave empty for cluster-internal only)          |

diff --git a/charts/generic-service/ci/ingress-extra-values.yaml b/charts/generic-service/ci/ingress-extra-values.yaml
@@ -23,3 +23,10 @@ ingress:
         nginx.ingress.kubernetes.io/configuration-snippet: other-dummy-config;
       protocol: grpc
       timeoutSeconds: 5
+    extra-port:
+      portRef: other-port
+      domains: ['custom-port.example.com']
+      annotations:
+        nginx.ingress.kubernetes.io/configuration-snippet: other-dummy-config;
+      protocol: grpc
+      timeoutSeconds: 5
diff --git a/charts/generic-service/templates/ingress-extra.yaml b/charts/generic-service/templates/ingress-extra.yaml
@@ -61,7 +61,9 @@ spec:
               service:
                 name: {{ include "generic-service.fullname" $ }}
                 port:
-                {{- if $extra.port }}
+                {{- if $extra.portRef }}
+                  name: {{ include "generic-service.normalize-protocol" $extra.protocol }}-{{ $extra.portRef }}
+                {{- else if $extra.port }}
                   name: {{ include "generic-service.normalize-protocol" $extra.protocol }}-{{ $name }}
                 {{- else }}
                   {{- if $extra.protocol }}

diff --git a/charts/generic-service/values.schema.json b/charts/generic-service/values.schema.json
@@ -652,6 +652,10 @@
                 "type": "integer",
                 "description": "The container port ingress traffic is routed to; defaults to value of ingress.port if not set"
               },
+              "portRef": {
+                "type": "string",
+                "description": "Reference to the name of another extra ingress to share its container port"
+              },
               "protocol": {
                 "type": "string",
                 "default": "http",