Skip to content
Open
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
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
run:
go: "1.24"
timeout: 10m
issues-exit-code: 1
tests: true
Expand Down
45 changes: 43 additions & 2 deletions cmd/print.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ import (

// Call init for notifications
_ "github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/notifications"

// Call init function for the implementations
_ "github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/implementations/kgateway"
)

type PrintRunner struct {
Expand Down Expand Up @@ -72,6 +75,10 @@ type PrintRunner struct {

// Provider specific flags --<provider>-<flag>.
providerSpecificFlags map[string]*string

// implementations indicates which implementations are used to generate
// implementation-specific (GEP-713 style) resources.
implementations []string
}

// PrintGatewayAPIObjects performs necessary steps to digest and print
Expand All @@ -81,14 +88,21 @@ type PrintRunner struct {
func (pr *PrintRunner) PrintGatewayAPIObjects(cmd *cobra.Command, _ []string) error {
err := pr.initializeResourcePrinter()
if err != nil {
return fmt.Errorf("failed to initialize resrouce printer: %w", err)
return fmt.Errorf("failed to initialize resource printer: %w", err)
}
err = pr.initializeNamespaceFilter()
if err != nil {
return fmt.Errorf("failed to initialize namespace filter: %w", err)
}

gatewayResources, notificationTablesMap, err := i2gw.ToGatewayAPIResources(cmd.Context(), pr.namespaceFilter, pr.inputFile, pr.providers, pr.getProviderSpecificFlags())
gatewayResources, notificationTablesMap, err := i2gw.ToGatewayAPIResources(
cmd.Context(),
pr.namespaceFilter,
pr.inputFile,
pr.providers,
pr.getProviderSpecificFlags(),
pr.implementations,
)
if err != nil {
return err
}
Expand Down Expand Up @@ -319,6 +333,26 @@ func newPrintCommand() *cobra.Command {
if openAPIExist && len(pr.providers) != 1 {
return fmt.Errorf("openapi3 must be the only provider when specified")
}

// Validate implementations (if any) against registered emitters.
if len(pr.implementations) > 0 {
// Build a list of supported implementations from the registry.
supported := make([]string, 0, len(i2gw.ImplementationEmitters))
for name := range i2gw.ImplementationEmitters {
supported = append(supported, name)
}

for _, impl := range pr.implementations {
if _, ok := i2gw.ImplementationEmitters[impl]; !ok {
return fmt.Errorf(
"unsupported implementation %q; supported implementations are: %s",
impl,
strings.Join(supported, ", "),
)
}
}
}

return nil
},
}
Expand All @@ -339,6 +373,13 @@ if specified with --namespace.`)
cmd.Flags().StringSliceVar(&pr.providers, "providers", []string{},
fmt.Sprintf("If present, the tool will try to convert only resources related to the specified providers, supported values are %v.", i2gw.GetSupportedProviders()))

cmd.Flags().StringSliceVar(
&pr.implementations,
"implementations",
[]string{},
"Comma-separated list of implementations for which to generate implementation-specific resources.",
)

pr.providerSpecificFlags = make(map[string]*string)
for provider, flags := range i2gw.GetProviderSpecificFlagDefinitions() {
for _, flag := range flags {
Expand Down
37 changes: 18 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
module github.com/kubernetes-sigs/ingress2gateway

go 1.24.0

toolchain go1.24.6
go 1.25.3

require (
github.com/GoogleCloudPlatform/gke-gateway-api v1.3.0
github.com/getkin/kin-openapi v0.124.0
github.com/google/go-cmp v0.7.0
github.com/kgateway-dev/kgateway/v2 v2.1.1
github.com/kong/kubernetes-ingress-controller/v2 v2.12.3
github.com/olekukonko/tablewriter v0.0.5
github.com/samber/lo v1.39.0
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.11.0
istio.io/api v1.20.0
github.com/spf13/cobra v1.10.1
github.com/stretchr/testify v1.11.1
istio.io/api v1.26.0-alpha.0.0.20251002142010-859b66f07fad
k8s.io/api v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/cli-runtime v0.34.0
Expand All @@ -25,19 +24,19 @@ require (
)

require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
Expand All @@ -63,18 +62,18 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/spf13/pflag v1.0.7 // indirect
golang.org/x/net v0.43.0 // indirect
github.com/spf13/pflag v1.0.10 // indirect
golang.org/x/net v0.44.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/sys v0.36.0 // indirect
golang.org/x/term v0.35.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/time v0.12.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/protobuf v1.36.8
google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
google.golang.org/protobuf v1.36.10
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/client-go v1.19.0-alpha.1.0.20231130185426-9f1859c8ff42
istio.io/client-go v1.26.0-alpha.0.0.20251002142408-752760d8f171
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
Expand Down
Loading