USHIFT-2443: Add expose config parameter

oglok · Apr 12, 2024 · 1ab555e · 1ab555e
1 parent 3f0ebd9
commit 1ab555e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/cmd/generate-config/config/config-openapi-spec.json b/cmd/generate-config/config/config-openapi-spec.json
@@ -101,11 +101,19 @@
  "ingress": {
  "type": "object",
  "required": [
+ "expose",
  "ports",
  "routeAdmissionPolicy",
  "status"
  ],
  "properties": {
+ "expose": {
+ "description": "List of NIC names and IP addresses where the router will be listening. Defaults to the IPs in the host.",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
  "ports": {
  "type": "object",
  "required": [

diff --git a/docs/user/howto_config.md b/docs/user/howto_config.md
@@ -23,6 +23,8 @@ dns:
 etcd:
  memoryLimitMB: 0
 ingress:
+ expose:
+ - ""
  ports:
  http: 0
  https: 0
@@ -71,6 +73,8 @@ dns:
 etcd:
  memoryLimitMB: 0
 ingress:
+ expose:
+ - ""
  ports:
  http: 80
  https: 443

diff --git a/packaging/microshift/config.yaml b/packaging/microshift/config.yaml
@@ -24,6 +24,9 @@ etcd:
  # Set a memory limit on the etcd process; etcd will begin paging memory when it gets to this value. 0 means no limit.
  memoryLimitMB: 0
 ingress:
+ # List of NIC names and IP addresses where the router will be listening. Defaults to the IPs in the host.
+ expose:
+ - ""
  ports:
  # Default router http port. Must be in range 1-65535.
  http: 80

diff --git a/pkg/config/ingress.go b/pkg/config/ingress.go
@@ -13,11 +13,14 @@ type IngressStatusEnum string
 type IngressConfig struct {
  // Default router status, can be Managed or Removed.
  // +kubebuilder:default=Managed
- Status IngressStatusEnum `json:"status"`
- AdmissionPolicy RouteAdmissionPolicy `json:"routeAdmissionPolicy"`
- Ports IngressPortsConfig `json:"ports"`
- ServingCertificate []byte `json:"-"`
- ServingKey []byte `json:"-"`
+ Status IngressStatusEnum `json:"status"`
+ AdmissionPolicy RouteAdmissionPolicy `json:"routeAdmissionPolicy"`
+ Ports IngressPortsConfig `json:"ports"`
+ // List of NIC names and IP addresses where the router will be listening.
+ // Defaults to the IPs in the host.
+ Expose []string `json:"expose"`
+ ServingCertificate []byte `json:"-"`
+ ServingKey []byte `json:"-"`
 }
 
 type RouteAdmissionPolicy struct {