Default listener and node ports

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · Nov 3, 2024 · a470af0 · a470af0
1 parent 71d8cd8
commit a470af0
Show file tree

Hide file tree

Showing 10 changed files with 18,601 additions and 6 deletions.
diff --git a/charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml b/charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
@@ -519,8 +519,10 @@ spec:
                   service:
                     properties:
                       nodeportRange:
+                        default: 30000-32767
                         type: string
                       portRange:
+                        default: 10000-12767
                         type: string
                     required:
                     - nodeportRange

diff --git a/charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml b/charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml
@@ -519,8 +519,10 @@ spec:
                   service:
                     properties:
                       nodeportRange:
+                        default: 30000-32767
                         type: string
                       portRange:
+                        default: 10000-12767
                         type: string
                     required:
                     - nodeportRange

diff --git a/charts/service-gateway-presets/values.openapiv3_schema.yaml b/charts/service-gateway-presets/values.openapiv3_schema.yaml
@@ -223,8 +223,10 @@ properties:
       service:
         properties:
           nodeportRange:
+            default: 30000-32767
             type: string
           portRange:
+            default: 10000-12767
             type: string
         required:
         - nodeportRange

diff --git a/charts/service-gateway/values.openapiv3_schema.yaml b/charts/service-gateway/values.openapiv3_schema.yaml
@@ -192,8 +192,10 @@ properties:
       service:
         properties:
           nodeportRange:
+            default: 30000-32767
             type: string
           portRange:
+            default: 10000-12767
             type: string
         required:
         - nodeportRange

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22.7
 toolchain go1.23.2
 
 require (
-	go.bytebuilders.dev/catalog v0.0.9-0.20241103061745-749cbfeb974f
+	go.bytebuilders.dev/catalog v0.0.9-0.20241103203407-01a77a6813c9
 	go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b
 	go.bytebuilders.dev/ui-wizards v0.8.0
 	go.openviz.dev/installer v0.0.0-20240731074805-a62b13eaedb0

diff --git a/go.sum b/go.sum
@@ -186,8 +186,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 go.appscode.dev/alerts v0.2.1-0.20240604101218-3069fbd7c6b8 h1:7FP18GEp6Jm0OUt5lsS9HjVitmiU9zZ5wVQwgU+Y23g=
 go.appscode.dev/alerts v0.2.1-0.20240604101218-3069fbd7c6b8/go.mod h1:5+qwuxF78YiFg/CEGfgfXREj7KEJYLgQeFhke4+lQ8k=
-go.bytebuilders.dev/catalog v0.0.9-0.20241103061745-749cbfeb974f h1:W8yOKV1qIvC5h9wgleeaxva2Z5yiw18Rx6dTw45eqEE=
-go.bytebuilders.dev/catalog v0.0.9-0.20241103061745-749cbfeb974f/go.mod h1:ndC200F9L1RM0MjYG19Bc2+nEikgPpTlGZ60d4oc+kU=
+go.bytebuilders.dev/catalog v0.0.9-0.20241103203407-01a77a6813c9 h1:ESCaEsrR0XJrrV8E81aZJCJ0fSHHfM7e9N6IDTIo/to=
+go.bytebuilders.dev/catalog v0.0.9-0.20241103203407-01a77a6813c9/go.mod h1:ndC200F9L1RM0MjYG19Bc2+nEikgPpTlGZ60d4oc+kU=
 go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b h1:loq3wv7NQY9givjW8djFMqe/1d+8j2wE4k5hueDIWC0=
 go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b/go.mod h1:/uMIfxqPIrDmiYWA28OW3xzogijxpwkicR4kK7jam9g=
 go.bytebuilders.dev/ui-wizards v0.8.0 h1:7hute2GVoidjP6wcI78kyUV/x2Lhpw4VodFCZpFE6Lc=

diff --git a/vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/gatewayconfig_types.go b/vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/gatewayconfig_types.go
@@ -201,7 +201,9 @@ type EnvoySpec struct {
 }
 
 type EnvoyServiceSpec struct {
-	PortRange     string `json:"portRange"`
+	// +kubebuilder:default="10000-12767"
+	PortRange string `json:"portRange"`
+	// +kubebuilder:default="30000-32767"
 	NodeportRange string `json:"nodeportRange"`
 }
 

diff --git a/vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/helpers.go b/vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/helpers.go
@@ -16,8 +16,15 @@ limitations under the License.
 
 package v1alpha1
 
+import egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
+
 func (i InfraTLS) MountCACerts() bool {
 	return i.Issuer == TLSIssuerTypeCA ||
 		i.Issuer == TLSIssuerTypeLEStaging ||
 		(i.Issuer == TLSIssuerTypeExternal && i.CA.Cert != "")
 }
+
+func (gwp GatewayParameter) UsesNodePort() bool {
+	return gwp.ServiceType == egv1a1.ServiceTypeNodePort ||
+		gwp.ServiceType == egv1a1.ServiceTypeLoadBalancer
+}
diff --git a/vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/openapi_generated.go b/vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/openapi_generated.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -266,7 +266,7 @@ github.com/zeebo/xxh3
 ## explicit; go 1.22.0
 go.appscode.dev/alerts/apis/alerts
 go.appscode.dev/alerts/apis/alerts/v1alpha1
-# go.bytebuilders.dev/catalog v0.0.9-0.20241103061745-749cbfeb974f
+# go.bytebuilders.dev/catalog v0.0.9-0.20241103203407-01a77a6813c9
 ## explicit; go 1.22.7
 go.bytebuilders.dev/catalog/api/gateway/v1alpha1
 # go.bytebuilders.dev/resource-model v0.1.1-0.20241023004602-2c43ef3bb37b