Add HTTPRoute as alternative to ingress by mikeshootzz · Pull Request #645 · vshn/appcat

mikeshootzz · 2026-04-17T11:54:18Z

Summary

Adds HTTPRoute (Gateway API) as an alternative to Ingress for Forgejo, Keycloak, and Nextcloud (incl. Collabora). Shared helper lives in pkg/comp-functions/functions/common/httproute.go. Enables Servala clusters to route via Gateway API.

Component PR: vshn/component-appcat#1147

Checklist

Update tests.
Link this PR to related issues.
Merge with /merge comment.

github-actions · 2026-04-17T12:02:22Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/678841

github-actions · 2026-04-17T15:42:55Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/678879

github-actions · 2026-04-21T07:55:31Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/679462

github-actions · 2026-04-21T13:39:21Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/679574

github-actions · 2026-04-22T08:45:41Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/679909

github-actions · 2026-04-22T11:44:57Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/679937

github-actions · 2026-04-22T12:20:59Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/679950

github-actions · 2026-04-22T12:23:25Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/679952

github-actions · 2026-04-22T14:57:25Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/680011

Kidswiss · 2026-04-23T07:21:14Z

 	return nil
 }
+
+func addNextcloudHTTPRoute(comp *vshnv1.VSHNNextcloud, svc *runtime.ServiceRuntime) *xfnproto.Result {


This function is basically redefined 4 times in the PR. And not even consistently:

Some pass AllowDeletion and some don't.

Some return fatals and some only warnings.

I'd suggest to move it to common and have it accept a common.HTTPRouteConfig.

Refactored this.

Kidswiss · 2026-04-23T07:27:12Z

 }
+
+func addNextcloudHTTPRoute(comp *vshnv1.VSHNNextcloud, svc *runtime.ServiceRuntime) *xfnproto.Result {
+	gatewayName := svc.Config.Data["httpGatewayName"]


Checking if it's set would be nice. If not set we should probably do a fatal.

github-actions · 2026-04-23T11:03:43Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/680380

Kidswiss · 2026-04-24T07:06:42Z

+				ServiceNameSuffix: svcNameSuffix,
+				ServicePortNumber: 3000,
+			},
+		}, runtime.KubeOptionAllowDeletion); err != nil {


I'm not sure about the AllowDeletion TBH.

On one hand we'd need it to seamlessly switch from gateway to ingress. The thing is, the other way around would currently probably not work, because we don't have the allow deletion on the ingress objects as far as I know.

Valid point. I'll remove AllowDeletion for the gateway related resources.

This allows HTTPRoutes to be used instead of ingress on servala clusters.

github-actions · 2026-04-24T11:21:36Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/680780

mdnix

Overall looking good.

Also we will have to add a redirect http -> https.
But I will take care of that on infra side.

mdnix · 2026-04-24T11:52:54Z

+	svc.Log.Info("Adding HTTPRoute for Collabora")
+
+	return common.ApplyHTTPRoute(comp, svc, common.HTTPRouteConfig{
+		FQDNs: []string{comp.Spec.Parameters.Service.Collabora.FQDN},


We should check if this FQDN is even set before doing ApplyHTTPRoute

good catch, thanks!

mdnix · 2026-04-24T11:54:56Z


 	err = AddCollaboraIngress(comp, svc)
+	if errors.Is(err, common.ErrHTTPGatewayNotConfigured) {
+		return runtime.NewFatalResult(fmt.Errorf("Failed to add Collabora Ingress: %w", err))


Suggested change

return runtime.NewFatalResult(fmt.Errorf("Failed to add Collabora Ingress: %w", err))

return runtime.NewFatalResult(fmt.Errorf("failed to add Collabora Ingress: %w", err))

fair but actually have multiple occurrences of this being capitalized already xD

mdnix · 2026-04-24T11:58:46Z

 }
 func AddCollaboraIngress(comp *vshnv1.VSHNNextcloud, svc *runtime.ServiceRuntime) error {

+	if svc.Config.Data["routeType"] == "HTTPRoute" {


This should be a const in common/httproute.go

const RouteTypeHTTPRoute = "HTTPRoute"`

and hide the check behind

func IsHTTPRouteMode(svc *runtime.ServiceRuntime) bool { return svc.Config.Data["routeType"] == RouteTypeHTTPRoute }

mdnix · 2026-04-24T12:02:24Z

+		})
+	}
+
+	annotations := getIngressAnnotations(svc, nil)


These are not necessary on the XLS since we don't use the certmanager shim?

ahh darn this was a leftover from my annotation shenanigans

mdnix · 2026-04-24T12:12:04Z

+	// HTTP upstream, so attach a BackendConfigPolicy that originates TLS to
+	// the keycloakx-http Service, validating against the CA secret created
+	// by common.CreateTLSCerts ("tls-ca-certificate" in the instance ns).
+	svcName := comp.GetName() + "-keycloakx-http"


I noticed that we don't react to the relativePath field in the VSHNKeycloak claim

k explain vshnkeycloak.spec.parameters.service.relativePath GROUP: vshn.appcat.vshn.io KIND: VSHNKeycloak VERSION: v1 FIELD: relativePath <string> DESCRIPTION: RelativePath on which Keycloak will listen.

If a user sets that it completely gets ignored and we always set path to /

true I didnt consider that. should be fixed now.

github-actions · 2026-04-24T12:47:08Z

Check out Your new Comp-Functions diff at: https://git.vshn.net/appcat/comp-func-pipelines/-/pipelines/680838

mikeshootzz added the minor label Apr 17, 2026

mikeshootzz marked this pull request as draft April 17, 2026 11:54

vshnbot mentioned this pull request Apr 17, 2026

Add HTTPRoute as alternative to ingress vshn/component-appcat#1147

Open

3 tasks

mikeshootzz force-pushed the feat/http-gateway branch from 191e471 to c61bb86 Compare April 22, 2026 08:40

mikeshootzz force-pushed the feat/http-gateway branch from c61bb86 to 91af5d2 Compare April 22, 2026 11:40

mikeshootzz force-pushed the feat/http-gateway branch 2 times, most recently from cd7489c to ac82d2b Compare April 22, 2026 12:19

mikeshootzz marked this pull request as ready for review April 22, 2026 14:51

mikeshootzz requested review from a team, Kidswiss, TheBigLee, mdnix and zugao and removed request for a team April 22, 2026 14:51

mikeshootzz force-pushed the feat/http-gateway branch from ac82d2b to 0984d68 Compare April 22, 2026 14:53

Kidswiss requested changes Apr 23, 2026

View reviewed changes

mikeshootzz requested a review from Kidswiss April 23, 2026 11:04

Kidswiss requested changes Apr 24, 2026

View reviewed changes

Add HTTPRoute as alternative to ingress

6a0808e

This allows HTTPRoutes to be used instead of ingress on servala clusters.

mikeshootzz force-pushed the feat/http-gateway branch from f1e7ac9 to 867917c Compare April 24, 2026 11:17

mikeshootzz requested a review from Kidswiss April 24, 2026 11:17

mdnix approved these changes Apr 24, 2026

View reviewed changes

Refactor adHTTPRoute

0e90424

mikeshootzz force-pushed the feat/http-gateway branch from 867917c to 0e90424 Compare April 24, 2026 12:41

mikeshootzz requested a review from mdnix April 24, 2026 12:51

	return runtime.NewFatalResult(fmt.Errorf("Failed to add Collabora Ingress: %w", err))
	return runtime.NewFatalResult(fmt.Errorf("failed to add Collabora Ingress: %w", err))

Conversation

mikeshootzz commented Apr 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

github-actions Bot commented Apr 17, 2026

Uh oh!

github-actions Bot commented Apr 17, 2026

Uh oh!

github-actions Bot commented Apr 21, 2026

Uh oh!

github-actions Bot commented Apr 21, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 23, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 24, 2026

Uh oh!

mdnix left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Apr 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mikeshootzz commented Apr 17, 2026 •

edited

Loading