Skip to content
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

bugfix: fix egctl experimental translate with error ns. #3984

Merged
merged 5 commits into from
Aug 13, 2024
Merged

bugfix: fix egctl experimental translate with error ns. #3984

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
723f5a2
bugfix: fix egctl experimental translate with error ns.
qicz Aug 1, 2024
2272076
Update internal/cmd/egctl/translate.go
qicz Aug 2, 2024
f14c676
Merge branch 'main' into fix-egctl-ns
qicz Aug 6, 2024
e43d50b
Merge branch 'main' into fix-egctl-ns
arkodg Aug 12, 2024
f0615a8
Merge branch 'main' into fix-egctl-ns
zirain Aug 13, 2024
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
33 changes: 18 additions & 15 deletions internal/cmd/egctl/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,47 +63,48 @@ func newTranslateCommand() *cobra.Command {
addMissingResources bool
outTypes []string
dnsDomain string
namespace string
)

translateCommand := &cobra.Command{
Use: "translate",
Short: "Translate Configuration from an input type to an output type",
Example: ` # Translate Gateway API Resources into All xDS Resources.
egctl experimental translate --from gateway-api --to xds --file <input file>
egctl experimental translate --from gateway-api --to xds --file <input file> -n <namespace>

# Translate Gateway API Resources into All xDS Resources in JSON output.
egctl experimental translate --from gateway-api --to xds --type all --output json --file <input file>
egctl experimental translate --from gateway-api --to xds --type all --output json --file <input file> -n <namespace>

# Translate Gateway API Resources into All xDS Resources in YAML output.
egctl experimental translate --from gateway-api --to xds --type all --output yaml --file <input file>
egctl experimental translate --from gateway-api --to xds --type all --output yaml --file <input file> -n <namespace>

# Translate Gateway API Resources into Bootstrap xDS Resources.
egctl experimental translate --from gateway-api --to xds --type bootstrap --file <input file>
egctl experimental translate --from gateway-api --to xds --type bootstrap --file <input file> -n <namespace>

# Translate Gateway API Resources into Cluster xDS Resources.
egctl experimental translate --from gateway-api --to xds --type cluster --file <input file>
egctl experimental translate --from gateway-api --to xds --type cluster --file <input file> -n <namespace>

# Translate Gateway API Resources into Listener xDS Resources.
egctl experimental translate --from gateway-api --to xds --type listener --file <input file>
egctl experimental translate --from gateway-api --to xds --type listener --file <input file> -n <namespace>

# Translate Gateway API Resources into Route xDS Resources.
egctl experimental translate --from gateway-api --to xds --type route --file <input file>
egctl experimental translate --from gateway-api --to xds --type route --file <input file> -n <namespace>

# Translate Gateway API Resources into Cluster xDS Resources with short syntax.
egctl x translate --from gateway-api --to xds -t cluster -o yaml -f <input file>
egctl x translate --from gateway-api --to xds -t cluster -o yaml -f <input file> -n <namespace>

# Translate Gateway API Resources into All xDS Resources with dummy resources added.
egctl x translate --from gateway-api --to xds -t cluster --add-missing-resources -f <input file>
egctl x translate --from gateway-api --to xds -t cluster --add-missing-resources -f <input file> -n <namespace>

# Translate Gateway API Resources into All xDS Resources in YAML output,
# also print the Gateway API Resources with updated status in the same output.
egctl experimental translate --from gateway-api --to gateway-api,xds --type all --output yaml --file <input file>
egctl experimental translate --from gateway-api --to gateway-api,xds --type all --output yaml --file <input file> -n <namespace>

# Translate Gateway API Resources into IR in YAML output,
egctl experimental translate --from gateway-api --to ir --output yaml --file <input file>
`,
RunE: func(cmd *cobra.Command, args []string) error {
return translate(cmd.OutOrStdout(), inFile, inType, outTypes, output, resourceType, addMissingResources, dnsDomain)
return translate(cmd.OutOrStdout(), inFile, inType, outTypes, output, resourceType, addMissingResources, namespace, dnsDomain)
},
}

Expand All @@ -117,6 +118,8 @@ func newTranslateCommand() *cobra.Command {
translateCommand.PersistentFlags().StringVarP(&resourceType, "type", "t", string(AllEnvoyConfigType), getValidResourceTypesStr())
translateCommand.PersistentFlags().BoolVarP(&addMissingResources, "add-missing-resources", "", false, "Provides dummy resources if missed")
translateCommand.PersistentFlags().StringVarP(&dnsDomain, "dns-domain", "", "cluster.local", "DNS domain used by k8s services, default is cluster.local")
translateCommand.PersistentFlags().StringVarP(&namespace, "namespace", "n", "envoy-gateway-system", "Namespace where envoy proxy pod are installed.")
qicz marked this conversation as resolved.
Show resolved Hide resolved

return translateCommand
}

Expand Down Expand Up @@ -220,7 +223,7 @@ func validate(inFile, inType string, outTypes []string, resourceType string) err
return nil
}

func translate(w io.Writer, inFile, inType string, outTypes []string, output, resourceType string, addMissingResources bool, dnsDomain string) error {
func translate(w io.Writer, inFile, inType string, outTypes []string, output, resourceType string, addMissingResources bool, namespace, dnsDomain string) error {
if err := validate(inFile, inType, outTypes, resourceType); err != nil {
return err
}
Expand All @@ -247,7 +250,7 @@ func translate(w io.Writer, inFile, inType string, outTypes []string, output, re
}
}
if outType == xdsType {
res, err := translateGatewayAPIToXds(dnsDomain, resourceType, resources)
res, err := translateGatewayAPIToXds(namespace, dnsDomain, resourceType, resources)
if err != nil {
return err
}
Expand Down Expand Up @@ -333,7 +336,7 @@ func translateGatewayAPIToGatewayAPI(resources *gatewayapi.Resources) (gatewayap
return gRes.Resources, nil
}

func translateGatewayAPIToXds(dnsDomain string, resourceType string, resources *gatewayapi.Resources) (map[string]any, error) {
func translateGatewayAPIToXds(namespace, dnsDomain string, resourceType string, resources *gatewayapi.Resources) (map[string]any, error) {
if resources.GatewayClass == nil {
return nil, fmt.Errorf("the GatewayClass resource is required")
}
Expand Down Expand Up @@ -363,7 +366,7 @@ func translateGatewayAPIToXds(dnsDomain string, resourceType string, resources *
xTranslator := &translator.Translator{
// Set some default settings for translation
GlobalRateLimit: &translator.GlobalRateLimitSettings{
ServiceURL: ratelimit.GetServiceURL("envoy-gateway", dnsDomain),
ServiceURL: ratelimit.GetServiceURL(namespace, dnsDomain),
},
}
if resources.EnvoyProxyForGatewayClass != nil {
Expand Down