From d8fe2d992b670c64cfd29173f8a068ac01b0e71a Mon Sep 17 00:00:00 2001 From: Alex Kursell Date: Mon, 11 Mar 2019 18:19:13 -0400 Subject: [PATCH] Remove useless nodeip call and deprecate --force-namespace-isolation --- cmd/nginx/flags.go | 4 ++-- docs/user-guide/cli-arguments.md | 1 - internal/ingress/controller/controller.go | 2 -- internal/k8s/main.go | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmd/nginx/flags.go b/cmd/nginx/flags.go index cdf9afb9e9..262becb9a8 100644 --- a/cmd/nginx/flags.go +++ b/cmd/nginx/flags.go @@ -106,7 +106,7 @@ Requires setting the publish-service parameter to a valid Service reference.`) electionID = flags.String("election-id", "ingress-controller-leader", `Election id to use for Ingress status updates.`) - forceIsolation = flags.Bool("force-namespace-isolation", false, + _ = flags.Bool("force-namespace-isolation", false, `Force namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace.`) @@ -162,6 +162,7 @@ Feature backed by OpenResty Lua libraries. Requires that OCSP stapling is not en ) flags.MarkDeprecated("status-port", `The status port is a unix socket now.`) + flags.MarkDeprecated("force-namespace-isolation", `This flag doesn't do anything.`) flag.Set("logtostderr", "true") @@ -243,7 +244,6 @@ Feature backed by OpenResty Lua libraries. Requires that OCSP stapling is not en HealthCheckTimeout: *healthCheckTimeout, PublishService: *publishSvc, PublishStatusAddress: *publishStatusAddress, - ForceNamespaceIsolation: *forceIsolation, UpdateStatusOnShutdown: *updateStatusOnShutdown, UseNodeInternalIP: *useNodeInternalIP, SyncRateLimit: *syncRateLimit, diff --git a/docs/user-guide/cli-arguments.md b/docs/user-guide/cli-arguments.md index 4ec5cd3f6e..ecf13e299b 100644 --- a/docs/user-guide/cli-arguments.md +++ b/docs/user-guide/cli-arguments.md @@ -17,7 +17,6 @@ They are set in the container spec of the `nginx-ingress-controller` Deployment | `--enable-dynamic-certificates` | Dynamically serves certificates instead of reloading NGINX when certificates are created, updated, or deleted. Currently does not support OCSP stapling, so --enable-ssl-chain-completion must be turned off. Assuming the certificate is generated with a 2048 bit RSA key/cert pair, this feature can store roughly 5000 certificates. This is an experiemental feature that currently is not ready for production use. Feature backed by OpenResty Lua libraries. (disabled by default) | | `--enable-ssl-chain-completion` | Autocomplete SSL certificate chains with missing intermediate CA certificates. A valid certificate chain is required to enable OCSP stapling. Certificates uploaded to Kubernetes must have the "Authority Information Access" X.509 v3 extension for this to succeed. (default true) | | `--enable-ssl-passthrough` | Enable SSL Passthrough. | -| `--force-namespace-isolation` | Force namespace isolation. Prevents Ingress objects from referencing Secrets and ConfigMaps located in a different namespace than their own. May be used together with watch-namespace. | | `--health-check-path string` | URL path of the health check endpoint. Configured inside the NGINX status server. All requests received on the port defined by the healthz-port parameter are forwarded internally to this path. (default "/healthz") | | `--health-check-timeout duration` | Time limit, in seconds, for a probe to health-check-path to succeed. (default 10) | | `--healthz-port int` | Port to use for the healthz endpoint. (default 10254) | diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go index 1878a31723..ad59793388 100644 --- a/internal/ingress/controller/controller.go +++ b/internal/ingress/controller/controller.go @@ -59,8 +59,6 @@ type Configuration struct { Namespace string - ForceNamespaceIsolation bool - // +optional TCPConfigMapName string // +optional diff --git a/internal/k8s/main.go b/internal/k8s/main.go index 2636dcd6fd..73ef35b43f 100644 --- a/internal/k8s/main.go +++ b/internal/k8s/main.go @@ -71,7 +71,6 @@ func GetNodeIPOrName(kubeClient clientset.Interface, name string, useInternalIP type PodInfo struct { Name string Namespace string - NodeIP string // Labels selectors of the running pod // This is used to search for other Ingress controller pods Labels map[string]string @@ -95,7 +94,6 @@ func GetPodDetails(kubeClient clientset.Interface) (*PodInfo, error) { return &PodInfo{ Name: podName, Namespace: podNs, - NodeIP: GetNodeIPOrName(kubeClient, pod.Spec.NodeName, true), Labels: pod.GetLabels(), }, nil }