From f5f9919a57e95034f794a04917eb96ebce652621 Mon Sep 17 00:00:00 2001 From: Clayton Gonsalves Date: Mon, 25 Mar 2024 15:02:41 +0100 Subject: [PATCH] appease linter gods Signed-off-by: Clayton Gonsalves --- ...salves-minor.md => 6306-clayton-gonsalves-minor.md} | 0 cmd/contour/routegen.go | 10 +++++----- site/content/docs/main/guides/route-testing.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename changelogs/unreleased/{6306-claytongonsalves-minor.md => 6306-clayton-gonsalves-minor.md} (100%) diff --git a/changelogs/unreleased/6306-claytongonsalves-minor.md b/changelogs/unreleased/6306-clayton-gonsalves-minor.md similarity index 100% rename from changelogs/unreleased/6306-claytongonsalves-minor.md rename to changelogs/unreleased/6306-clayton-gonsalves-minor.md diff --git a/cmd/contour/routegen.go b/cmd/contour/routegen.go index a9a7cc77d62..a6dede9eeb8 100644 --- a/cmd/contour/routegen.go +++ b/cmd/contour/routegen.go @@ -98,11 +98,11 @@ func registerRouteGen(app *kingpin.Application) (*kingpin.CmdClause, *routeGenCo return nil } - routeGenCmd := app.Command("routegen", "Generate Envoy route configuration based on server config and resources") - routeGenCmd.Arg("resources", "Set of input resource manifests for the Envoy route configuration").Required().StringsVar(&cfg.inputManifests) - routeGenCmd.Flag("config-path", "Path to base configuration file").Short('c').PlaceHolder("/path/to/file").Action(parseContourConfigFile).ExistingFileVar(&configFile) - routeGenCmd.Flag("ingress-class-name", "Contour IngressClass name").PlaceHolder("").StringVar(&cfg.serveCtx.ingressClassName) - routeGenCmd.Flag("output", "File to write route config into (defaults to stdout)").StringVar(&cfg.output) + routeGenCmd := app.Command("routegen", "Generate Envoy route configuration based on server config and resources.") + routeGenCmd.Arg("resources", "Set of input resource manifests for the Envoy route configuration.").Required().StringsVar(&cfg.inputManifests) + routeGenCmd.Flag("config-path", "Path to base configuration file.").Short('c').PlaceHolder("/path/to/file").Action(parseContourConfigFile).ExistingFileVar(&configFile) + routeGenCmd.Flag("ingress-class-name", "Contour IngressClass name.").PlaceHolder("").StringVar(&cfg.serveCtx.ingressClassName) + routeGenCmd.Flag("output", "File to write route config into (defaults to stdout).").StringVar(&cfg.output) return routeGenCmd, cfg } diff --git a/site/content/docs/main/guides/route-testing.md b/site/content/docs/main/guides/route-testing.md index 27f7084820c..90fda1f9c4f 100644 --- a/site/content/docs/main/guides/route-testing.md +++ b/site/content/docs/main/guides/route-testing.md @@ -18,7 +18,7 @@ router_check_tool --version ``` ## Generating Envoy routes from Contour -The Contour routegen tool requires Kubernetes manifests as input to generate envoy routes. The manifest should contain atleast one of APIGateway, HTTPProxy or an Ingress along with their referencing Kubernetes services. +The Contour routegen tool requires Kubernetes manifests as input to generate envoy routes. The manifest should contain at least one of APIGateway, HTTPProxy or an Ingress along with their referencing Kubernetes services. A sample manifest is given below