Merge pull request #3887 from Shopify/remove-nodeip

Remove useless nodeip calls and deprecate --force-namespace-isolation
This commit is contained in:
Kubernetes Prow Robot 2019-03-11 16:38:38 -07:00 committed by GitHub
commit 55bda6e7f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 7 deletions

View file

@ -59,8 +59,6 @@ type Configuration struct {
Namespace string
ForceNamespaceIsolation bool
// +optional
TCPConfigMapName string
// +optional

View file

@ -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
}