From 495d5b27970ecf69d90c19190282033e1c88133a Mon Sep 17 00:00:00 2001 From: Arnob Kumar Saha Date: Mon, 12 Oct 2026 23:58:28 +0600 Subject: [PATCH] collect-images: advertise gateway API versions when rendering service-gateway Signed-off-by: Arnob Kumar Saha --- pkg/collect/klustermanager.go | 10 +++++++--- pkg/collect/voyagermesh.go | 8 +++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkg/collect/klustermanager.go b/pkg/collect/klustermanager.go index 32a9827..33719a4 100644 --- a/pkg/collect/klustermanager.go +++ b/pkg/collect/klustermanager.go @@ -157,9 +157,13 @@ func fluxcdManagerImages(version string) ([]string, error) { return sortUnique(refs), nil } -func renderTemplate(chart, version, tmpl string) (string, error) { - return output("", "helm", "template", chart, ociPrefix+"/"+chart, - "--version", version, "-n", chart, "--show-only", tmpl) +func renderTemplate(chart, version, tmpl string, apiVersions ...string) (string, error) { + args := []string{"template", chart, ociPrefix + "/" + chart, + "--version", version, "-n", chart, "--show-only", tmpl} + for _, v := range apiVersions { + args = append(args, "--api-versions", v) + } + return output("", "helm", args...) } func chartAppVersion(chart, version string) (string, error) { diff --git a/pkg/collect/voyagermesh.go b/pkg/collect/voyagermesh.go index 4248851..ae5956b 100644 --- a/pkg/collect/voyagermesh.go +++ b/pkg/collect/voyagermesh.go @@ -46,6 +46,12 @@ const ( serviceGatewayTemplate = "templates/gateway/gwclass.yaml" ) +// gwclass.yaml is guarded on these CRDs being served; helm template is offline. +var serviceGatewayAPIVersions = []string{ + "gateway.networking.k8s.io/v1beta1/GatewayClass", + "gateway.envoyproxy.io/v1alpha1/EnvoyProxy", +} + func Voyagermesh() error { l, err := newLayout() if err != nil { @@ -70,7 +76,7 @@ func Voyagermesh() error { } fmt.Printf("==> %s @ %s\n", serviceGatewayChart, ver) - render, err := renderTemplate(serviceGatewayChart, ver, serviceGatewayTemplate) + render, err := renderTemplate(serviceGatewayChart, ver, serviceGatewayTemplate, serviceGatewayAPIVersions...) if err != nil { return err }