Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions pkg/collect/klustermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 7 additions & 1 deletion pkg/collect/voyagermesh.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}
Expand Down
Loading