diff --git a/docs/tutorials/gloo-proxy.md b/docs/tutorials/gloo-proxy.md index b1fb8d162..a42fdae83 100644 --- a/docs/tutorials/gloo-proxy.md +++ b/docs/tutorials/gloo-proxy.md @@ -25,7 +25,7 @@ spec: image: registry.k8s.io/external-dns/external-dns:v0.13.2 args: - --source=gloo-proxy - - --gloo-namespaces=custom-gloo-system # comma separated gloo system namespace list. Omit to use the default (gloo-system) + - --gloo-namespace=custom-gloo-system # comma separated gloo system namespace list. Omit to use the default (gloo-system) - --provider=aws - --registry=txt - --txt-owner-id=my-identifier @@ -93,7 +93,7 @@ spec: image: registry.k8s.io/external-dns/external-dns:v0.13.2 args: - --source=gloo-proxy - - --gloo-namespaces=custom-gloo-system # comma separated gloo system namespace list. Omit to use the default (gloo-system) + - --gloo-namespace=custom-gloo-system # comma separated gloo system namespace list. Omit to use the default (gloo-system) - --provider=aws - --registry=txt - --txt-owner-id=my-identifier diff --git a/main.go b/main.go index 21e196464..ece1b0290 100644 --- a/main.go +++ b/main.go @@ -134,7 +134,7 @@ func main() { CFUsername: cfg.CFUsername, CFPassword: cfg.CFPassword, ContourLoadBalancerService: cfg.ContourLoadBalancerService, - GlooNamespaces: cfg.GlooNamespaces, + GlooNamespace: cfg.GlooNamespace, SkipperRouteGroupVersion: cfg.SkipperRouteGroupVersion, RequestTimeout: cfg.RequestTimeout, DefaultTargets: cfg.DefaultTargets, diff --git a/pkg/apis/externaldns/types.go b/pkg/apis/externaldns/types.go index 85b75c651..9e58b9410 100644 --- a/pkg/apis/externaldns/types.go +++ b/pkg/apis/externaldns/types.go @@ -48,7 +48,7 @@ type Config struct { RequestTimeout time.Duration DefaultTargets []string ContourLoadBalancerService string - GlooNamespaces string + GlooNamespace string SkipperRouteGroupVersion string Sources []string Namespace string @@ -207,7 +207,7 @@ var defaultConfig = &Config{ RequestTimeout: time.Second * 30, DefaultTargets: []string{}, ContourLoadBalancerService: "heptio-contour/contour", - GlooNamespaces: "gloo-system", + GlooNamespace: "gloo-system", SkipperRouteGroupVersion: "zalando.org/v1", Sources: nil, Namespace: "", @@ -398,7 +398,7 @@ func (cfg *Config) ParseFlags(args []string) error { app.Flag("contour-load-balancer", "The fully-qualified name of the Contour load balancer service. (default: heptio-contour/contour)").Default("heptio-contour/contour").StringVar(&cfg.ContourLoadBalancerService) // Flags related to Gloo - app.Flag("gloo-namespaces", "Coma separated list of gloo namespaces. (default: gloo-system)").Default("gloo-system").StringVar(&cfg.GlooNamespaces) + app.Flag("gloo-namespace", "Coma separated list of gloo namespaces. (default: gloo-system)").Default("gloo-system").StringVar(&cfg.GlooNamespace) // Flags related to Skipper RouteGroup app.Flag("skipper-routegroup-groupversion", "The resource version for skipper routegroup").Default(source.DefaultRoutegroupVersion).StringVar(&cfg.SkipperRouteGroupVersion) diff --git a/pkg/apis/externaldns/types_test.go b/pkg/apis/externaldns/types_test.go index fb262b0f9..efa2df6ea 100644 --- a/pkg/apis/externaldns/types_test.go +++ b/pkg/apis/externaldns/types_test.go @@ -36,7 +36,7 @@ var ( KubeConfig: "", RequestTimeout: time.Second * 30, ContourLoadBalancerService: "heptio-contour/contour", - GlooNamespaces: "gloo-system", + GlooNamespace: "gloo-system", SkipperRouteGroupVersion: "zalando.org/v1", Sources: []string{"service"}, Namespace: "", @@ -136,7 +136,7 @@ var ( KubeConfig: "/some/path", RequestTimeout: time.Second * 77, ContourLoadBalancerService: "heptio-contour-other/contour-other", - GlooNamespaces: "gloo-not-system,gloo-second-system", + GlooNamespace: "gloo-not-system,gloo-second-system", SkipperRouteGroupVersion: "zalando.org/v2", Sources: []string{"service", "ingress", "connector"}, Namespace: "namespace", @@ -266,7 +266,7 @@ func TestParseFlags(t *testing.T) { "--kubeconfig=/some/path", "--request-timeout=77s", "--contour-load-balancer=heptio-contour-other/contour-other", - "--gloo-namespaces=gloo-not-system,gloo-second-system", + "--gloo-namespace=gloo-not-system,gloo-second-system", "--skipper-routegroup-groupversion=zalando.org/v2", "--source=service", "--source=ingress", @@ -391,7 +391,7 @@ func TestParseFlags(t *testing.T) { "EXTERNAL_DNS_KUBECONFIG": "/some/path", "EXTERNAL_DNS_REQUEST_TIMEOUT": "77s", "EXTERNAL_DNS_CONTOUR_LOAD_BALANCER": "heptio-contour-other/contour-other", - "EXTERNAL_DNS_GLOO_NAMESPACES": "gloo-not-system,gloo-second-system", + "EXTERNAL_DNS_GLOO_NAMESPACE": "gloo-not-system,gloo-second-system", "EXTERNAL_DNS_SKIPPER_ROUTEGROUP_GROUPVERSION": "zalando.org/v2", "EXTERNAL_DNS_SOURCE": "service\ningress\nconnector", "EXTERNAL_DNS_NAMESPACE": "namespace", diff --git a/source/store.go b/source/store.go index f37fb9462..87ba403a2 100644 --- a/source/store.go +++ b/source/store.go @@ -67,7 +67,7 @@ type Config struct { CFUsername string CFPassword string ContourLoadBalancerService string - GlooNamespaces string + GlooNamespace string SkipperRouteGroupVersion string RequestTimeout time.Duration DefaultTargets []string @@ -288,7 +288,7 @@ func BuildWithConfig(ctx context.Context, source string, p ClientGenerator, cfg if err != nil { return nil, err } - return NewGlooSource(dynamicClient, kubernetesClient, cfg.GlooNamespaces) + return NewGlooSource(dynamicClient, kubernetesClient, cfg.GlooNamespace) case "openshift-route": ocpClient, err := p.OpenShiftClient() if err != nil {