Skip to content

operator: ingress support #176

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
Oct 30, 2025
Merged

operator: ingress support #176

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
b07a4a0
operator: fix ingress mode install
mangelajo Oct 27, 2025
3e595c8
operator: ingress support
mangelajo Oct 28, 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
60 changes: 42 additions & 18 deletions deploy/operator/internal/controller/jumpstarter/endpoints/endpoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"

operatorv1alpha1 "github.com/jumpstarter-dev/jumpstarter-controller/deploy/operator/api/v1alpha1"
"github.com/jumpstarter-dev/jumpstarter-controller/deploy/operator/internal/utils"
)

// Reconciler provides endpoint reconciliation functionality
Expand Down Expand Up @@ -127,6 +128,15 @@ func (r *Reconciler) ReconcileControllerEndpoint(ctx context.Context, owner meta
// Note: ClusterIP uses no suffix (most common for in-cluster communication)
// LoadBalancer uses "-lb" suffix, NodePort uses "-np" suffix

// Ingress resource (uses ClusterIP service)
if endpoint.Ingress != nil && endpoint.Ingress.Enabled {
serviceName := servicePort.Name
// Create the Ingress resource pointing to the ClusterIP service
if err := r.createIngressForEndpoint(ctx, owner, serviceName, servicePort.Port, endpoint, baseLabels); err != nil {
return err
}
}

// LoadBalancer service
if endpoint.LoadBalancer != nil && endpoint.LoadBalancer.Enabled {
if err := r.createService(ctx, owner, servicePort, "-lb", corev1.ServiceTypeLoadBalancer,
Expand All @@ -144,17 +154,28 @@ func (r *Reconciler) ReconcileControllerEndpoint(ctx context.Context, owner meta
}

// ClusterIP service (no suffix for cleaner in-cluster service names)
if endpoint.ClusterIP != nil && endpoint.ClusterIP.Enabled {
// Create ClusterIP if explicitly enabled OR if Ingress/Route need it
if (endpoint.ClusterIP != nil && endpoint.ClusterIP.Enabled) ||
(endpoint.Ingress != nil && endpoint.Ingress.Enabled) ||
(endpoint.Route != nil && endpoint.Route.Enabled) {
// Merge annotations and labels from ClusterIP config if present
var annotations, labels map[string]string
if endpoint.ClusterIP != nil {
annotations = endpoint.ClusterIP.Annotations
labels = endpoint.ClusterIP.Labels
}
if err := r.createService(ctx, owner, servicePort, "", corev1.ServiceTypeClusterIP,
podSelector, baseLabels, endpoint.ClusterIP.Annotations, endpoint.ClusterIP.Labels); err != nil {
podSelector, baseLabels, annotations, labels); err != nil {
return err
}
}

// If no service type is explicitly enabled, create a default ClusterIP service
if (endpoint.LoadBalancer == nil || !endpoint.LoadBalancer.Enabled) &&
(endpoint.NodePort == nil || !endpoint.NodePort.Enabled) &&
(endpoint.ClusterIP == nil || !endpoint.ClusterIP.Enabled) {
(endpoint.ClusterIP == nil || !endpoint.ClusterIP.Enabled) &&
(endpoint.Ingress == nil || !endpoint.Ingress.Enabled) &&
(endpoint.Route == nil || !endpoint.Route.Enabled) {

// TODO: Default to Route or Ingress depending of the type of cluster
if err := r.createService(ctx, owner, servicePort, "", corev1.ServiceTypeClusterIP,
Expand Down Expand Up @@ -190,10 +211,11 @@ func (r *Reconciler) ReconcileRouterReplicaEndpoint(ctx context.Context, owner m
// Note: ClusterIP uses no suffix (most common for in-cluster communication)
// LoadBalancer uses "-lb" suffix, NodePort uses "-np" suffix

// Ingress service
// Ingress resource (uses ClusterIP service)
if endpoint.Ingress != nil && endpoint.Ingress.Enabled {
if err := r.createService(ctx, owner, servicePort, "-ing", corev1.ServiceTypeClusterIP,
podSelector, baseLabels, endpoint.Ingress.Annotations, endpoint.Ingress.Labels); err != nil {
serviceName := servicePort.Name
// Create the Ingress resource pointing to the ClusterIP service
if err := r.createIngressForEndpoint(ctx, owner, serviceName, servicePort.Port, endpoint, baseLabels); err != nil {
return err
}
}
Expand Down Expand Up @@ -223,9 +245,18 @@ func (r *Reconciler) ReconcileRouterReplicaEndpoint(ctx context.Context, owner m
}

// ClusterIP service (no suffix for cleaner in-cluster service names)
if endpoint.ClusterIP != nil && endpoint.ClusterIP.Enabled {
// Create ClusterIP if explicitly enabled OR if Ingress/Route need it
if (endpoint.ClusterIP != nil && endpoint.ClusterIP.Enabled) ||
(endpoint.Ingress != nil && endpoint.Ingress.Enabled) ||
(endpoint.Route != nil && endpoint.Route.Enabled) {
// Merge annotations and labels from ClusterIP config if present
var annotations, labels map[string]string
if endpoint.ClusterIP != nil {
annotations = endpoint.ClusterIP.Annotations
labels = endpoint.ClusterIP.Labels
}
if err := r.createService(ctx, owner, servicePort, "", corev1.ServiceTypeClusterIP,
podSelector, baseLabels, endpoint.ClusterIP.Annotations, endpoint.ClusterIP.Labels); err != nil {
podSelector, baseLabels, annotations, labels); err != nil {
return err
}
}
Expand All @@ -242,8 +273,7 @@ func (r *Reconciler) ReconcileRouterReplicaEndpoint(ctx context.Context, owner m
}
}

// TODO: Create ingress/route resources here instead of calling the deprecated ReconcileEndpoint
// For now, ingress and route are handled by creating ClusterIP services above
// Note: Ingress resources are now created above. Route resources still need to be implemented.

return nil
}
Expand All @@ -257,14 +287,8 @@ func (r *Reconciler) createService(ctx context.Context, owner metav1.Object, ser
// Build service name with suffix to avoid conflicts
serviceName := servicePort.Name + nameSuffix

// Merge labels
serviceLabels := make(map[string]string)
for k, v := range baseLabels {
serviceLabels[k] = v
}
for k, v := range extraLabels {
serviceLabels[k] = v
}
// Merge labels (extra labels take precedence)
serviceLabels := utils.MergeMaps(baseLabels, extraLabels)

// Ensure annotations map is initialized
if annotations == nil {
Expand Down
Loading
Loading