Skip to content

feat: configurable tls port #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2025
Merged

feat: configurable tls port #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a024ae
feat: gateway config with tls port
robertgraeff Nov 11, 2025
fda7d96
feat: add tls port to gateway
robertgraeff Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions api/crds/manifests/gateway.openmcp.cloud_gatewayserviceconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,20 @@ spec:
required:
- chart
type: object
gateway:
description: Gateway configuration.
properties:
tlsPort:
default: 9443
description: TLSPort is the port on which the gateway will listen
for TLS traffic.
format: int32
type: integer
type: object
required:
- dns
- envoyGateway
- gateway
type: object
type: object
served: true
Expand Down
9 changes: 9 additions & 0 deletions api/gateway/v1alpha1/config_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ type GatewayServiceConfigSpec struct {
// Clusters that should be included in the gateway configuration.
Clusters []ClusterTerm `json:"clusters,omitempty"`

// Gateway configuration.
Gateway GatewayConfig `json:"gateway"`

// DNS configuration.
DNS DNSConfig `json:"dns"`
}
Expand Down Expand Up @@ -88,6 +91,12 @@ type ImagesConfig struct {
ImagePullSecrets []meta.LocalObjectReference `json:"imagePullSecrets,omitempty"`
}

type GatewayConfig struct {
// TLSPort is the port on which the gateway will listen for TLS traffic.
// +kubebuilder:default=9443
TLSPort int32 `json:"tlsPort,omitempty"`
Copy link
Member

@ValentinGerlach ValentinGerlach Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpicking: Can we change this to int? Then we don't need the int(...) conversion in pkg/envoy/config.go.

Copy link
Member

@ValentinGerlach ValentinGerlach Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed that the Gateway API is using int32. Then we can also leave it like that :)

}

type DNSConfig struct {
// BaseDomain is the domain from which subdomains will be derived. Example: dev.openmcp.example.com.
// +kubebuilder:validation:Required
Expand Down
16 changes: 16 additions & 0 deletions api/gateway/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions internal/controllers/cluster/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ func (r *ClusterReconciler) buildGatewayManager(ctx context.Context, req reconci
gw := &envoy.Gateway{
Cluster: c,
EnvoyConfig: r.Config.Spec.EnvoyGateway,
GatewayConfig: r.Config.Spec.Gateway,
DNSConfig: r.Config.Spec.DNS,
PlatformClient: r.PlatformCluster.Client(),
ClusterClient: access.Client(),
Expand Down
12 changes: 11 additions & 1 deletion pkg/envoy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"strconv"
"time"

corev1 "k8s.io/api/core/v1"
Expand All @@ -27,6 +28,7 @@ const (
gatewayClassName = "envoy-gateway"
gatewayName = "default"
gatewayNamespace = "openmcp-system"
tlsPortAnnotation = "gateway.openmcp.cloud/tls-port"
baseDomainAnnotation = "dns.openmcp.cloud/base-domain"
)

Expand Down Expand Up @@ -102,7 +104,7 @@ func (g *Gateway) reconcileGatewayFunc(obj *gatewayv1.Gateway) func() error {
obj.Spec.Listeners = []gatewayv1.Listener{
{
Name: "tls",
Port: 9443,
Port: g.getTLSPort(),
Protocol: gatewayv1.TLSProtocolType,
TLS: &gatewayv1.ListenerTLSConfig{
Mode: ptr.To(gatewayv1.TLSModePassthrough),
Expand All @@ -124,6 +126,7 @@ func (g *Gateway) reconcileGatewayFunc(obj *gatewayv1.Gateway) func() error {
}

baseDomain := g.generateBaseDomain()
metav1.SetMetaDataAnnotation(&obj.ObjectMeta, tlsPortAnnotation, strconv.Itoa(int(g.getTLSPort())))
metav1.SetMetaDataAnnotation(&obj.ObjectMeta, baseDomainAnnotation, baseDomain)

return nil
Expand All @@ -134,6 +137,13 @@ func (g *Gateway) generateBaseDomain() string {
return fmt.Sprintf("%s.%s.%s", g.Cluster.Name, g.Cluster.Namespace, g.DNSConfig.BaseDomain)
}

func (g *Gateway) getTLSPort() int32 {
if g.GatewayConfig.TLSPort != 0 {
return g.GatewayConfig.TLSPort
}
return 9443
}

// ----- EnvoyProxy -----

func getEnvoyProxy() *unstructured.Unstructured {
Expand Down
1 change: 1 addition & 0 deletions pkg/envoy/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (
type Gateway struct {
Cluster *clustersv1alpha1.Cluster
EnvoyConfig v1alpha1.EnvoyGatewayConfig
GatewayConfig v1alpha1.GatewayConfig
DNSConfig v1alpha1.DNSConfig
PlatformClient client.Client
ClusterClient client.Client
Expand Down