diff --git a/ingress/controllers/nginx/README.md b/ingress/controllers/nginx/README.md index c7a9cf5ff7..ac39f4ccd7 100644 --- a/ingress/controllers/nginx/README.md +++ b/ingress/controllers/nginx/README.md @@ -19,6 +19,7 @@ This is a nginx Ingress controller that uses [ConfigMap](https://github.com/kube * [NGINX customization](configuration.md) * [NGINX status page](#nginx-status-page) * [Disabling NGINX ingress controller](#disabling-nginx-ingress-controller) +* [Local cluster](#local-cluster) * [Debug & Troubleshooting](#troubleshooting) * [Limitations](#limitations) * [NGINX Notes](#nginx-notes) @@ -343,6 +344,12 @@ To extract the information in JSON format the module provides a custom URL: `/ng Setting the annotation `kubernetes.io/ingress.class` to any value other than "nginx" or the empty string, will force the NGINX Ingress controller to ignore your Ingress. Do this if you wish to use one of the other Ingress controllers at the same time as the NGINX controller. +### Local cluster + +Using [`hack/local-up-cluster.sh`](https://github.com/kubernetes/kubernetes/blob/master/hack/local-up-cluster.sh) is possible to start a local kubernetes cluster consisting of a master and a single node. Please read [running-locally.md](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/running-locally.md) for more details. + +Use of `hostNetwork: true` in the ingress controller is required to falls back at localhost:8080 for the apiserver if every other client creation check fails (eg: service account not present, kubeconfig doesn't exist, no master env vars...) + ### Debug & Troubleshooting diff --git a/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml index 1563147188..e7820cf53c 100644 --- a/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml +++ b/ingress/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml b/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml index 7d3fb7075e..0206efd0dd 100644 --- a/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml +++ b/ingress/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/custom-template/custom-template.yaml b/ingress/controllers/nginx/examples/custom-template/custom-template.yaml index d56a43d836..552dccb006 100644 --- a/ingress/controllers/nginx/examples/custom-template/custom-template.yaml +++ b/ingress/controllers/nginx/examples/custom-template/custom-template.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml b/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml index b2f080f6d9..7c65a83441 100644 --- a/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml +++ b/ingress/controllers/nginx/examples/daemonset/as-daemonset.yaml @@ -16,7 +16,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/default/rc-default.yaml b/ingress/controllers/nginx/examples/default/rc-default.yaml index 63222e5a04..f27fe82952 100644 --- a/ingress/controllers/nginx/examples/default/rc-default.yaml +++ b/ingress/controllers/nginx/examples/default/rc-default.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/full/rc-full.yaml b/ingress/controllers/nginx/examples/full/rc-full.yaml index feaf2bd09c..e36ec539ab 100644 --- a/ingress/controllers/nginx/examples/full/rc-full.yaml +++ b/ingress/controllers/nginx/examples/full/rc-full.yaml @@ -27,7 +27,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml index d5c1e1156f..04591556f4 100644 --- a/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml +++ b/ingress/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml b/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml index 557bb60275..5b5671401b 100644 --- a/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml +++ b/ingress/controllers/nginx/examples/sysctl/change-proc-values-rc.yaml @@ -95,7 +95,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml b/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml index 2aae0a96dc..2185590fbb 100644 --- a/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml +++ b/ingress/controllers/nginx/examples/tcp/rc-tcp.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/tls/rc-ssl.yaml b/ingress/controllers/nginx/examples/tls/rc-ssl.yaml index 63222e5a04..f27fe82952 100644 --- a/ingress/controllers/nginx/examples/tls/rc-ssl.yaml +++ b/ingress/controllers/nginx/examples/tls/rc-ssl.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/examples/udp/rc-udp.yaml b/ingress/controllers/nginx/examples/udp/rc-udp.yaml index 38bfbabc28..5d1df54565 100644 --- a/ingress/controllers/nginx/examples/udp/rc-udp.yaml +++ b/ingress/controllers/nginx/examples/udp/rc-udp.yaml @@ -22,7 +22,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/main.go b/ingress/controllers/nginx/main.go index 4a3808167e..fa08e1facf 100644 --- a/ingress/controllers/nginx/main.go +++ b/ingress/controllers/nginx/main.go @@ -38,7 +38,7 @@ import ( ) const ( - healthPort = 10249 + healthPort = 10254 ) var ( @@ -56,10 +56,6 @@ var ( nxgConfigMap = flags.String("nginx-configmap", "", `Name of the ConfigMap that containes the custom nginx configuration to use`) - inCluster = flags.Bool("running-in-cluster", true, - `Optional, if this controller is running in a kubernetes cluster, use the - pod secrets for creating a Kubernetes client.`) - tcpConfigMapName = flags.String("tcp-services-configmap", "", `Name of the ConfigMap that containes the definition of the TCP services to expose. The key in the map indicates the external port to be used. The value is the name of the @@ -91,7 +87,6 @@ var ( ) func main() { - var kubeClient *unversioned.Client flags.AddGoFlagSet(flag.CommandLine) flags.Parse(os.Args) clientConfig := kubectl_util.DefaultClientConfig(flags) @@ -107,26 +102,20 @@ func main() { glog.Fatalf("Please specify --default-backend-service") } - var err error - if *inCluster { - kubeClient, err = unversioned.NewInCluster() - } else { - config, connErr := clientConfig.ClientConfig() - if connErr != nil { - glog.Fatalf("error connecting to the client: %v", err) - } - kubeClient, err = unversioned.New(config) + config, err := clientConfig.ClientConfig() + if err != nil { + glog.Fatalf("error connecting to the client: %v", err) } + kubeClient, err := unversioned.New(config) + if err != nil { glog.Fatalf("failed to create client: %v", err) } - runtimePodInfo := &podInfo{NodeIP: "127.0.0.1"} - if *inCluster { - runtimePodInfo, err = getPodDetails(kubeClient) - if err != nil { - glog.Fatalf("unexpected error getting runtime information: %v", err) - } + runtimePodInfo, err := getPodDetails(kubeClient) + if err != nil { + runtimePodInfo = &podInfo{NodeIP: "127.0.0.1"} + glog.Warningf("unexpected error getting runtime information: %v", err) } if err := isValidService(kubeClient, *defaultSvc); err != nil { glog.Fatalf("no service with name %v found: %v", *defaultSvc, err) diff --git a/ingress/controllers/nginx/nginx/utils.go b/ingress/controllers/nginx/nginx/utils.go index dea89f3859..fa18be3929 100644 --- a/ingress/controllers/nginx/nginx/utils.go +++ b/ingress/controllers/nginx/nginx/utils.go @@ -228,7 +228,7 @@ func diff(b1, b2 []byte) (data []byte, err error) { func sysctlSomaxconn() int { maxConns, err := sysctl.GetSysctl("net/core/somaxconn") if err != nil || maxConns < 512 { - glog.Warningf("system net.core.somaxconn=%v. Using NGINX default (511)", maxConns) + glog.V(3).Infof("system net.core.somaxconn=%v. Using NGINX default (511)", maxConns) return 511 } diff --git a/ingress/controllers/nginx/rc.yaml b/ingress/controllers/nginx/rc.yaml index 3d449b0c4f..0839334140 100644 --- a/ingress/controllers/nginx/rc.yaml +++ b/ingress/controllers/nginx/rc.yaml @@ -74,7 +74,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 10249 + port: 10254 scheme: HTTP initialDelaySeconds: 30 timeoutSeconds: 5 diff --git a/ingress/controllers/nginx/utils.go b/ingress/controllers/nginx/utils.go index bf696e7212..491e30539a 100644 --- a/ingress/controllers/nginx/utils.go +++ b/ingress/controllers/nginx/utils.go @@ -119,6 +119,10 @@ func getPodDetails(kubeClient *unversioned.Client) (*podInfo, error) { podName := os.Getenv("POD_NAME") podNs := os.Getenv("POD_NAMESPACE") + if podName == "" && podNs == "" { + return nil, fmt.Errorf("unable to get POD information (missing POD_NAME or POD_NAMESPACE environment variable") + } + err := waitForPodRunning(kubeClient, podNs, podName, time.Millisecond*200, time.Second*30) if err != nil { return nil, err @@ -126,7 +130,7 @@ func getPodDetails(kubeClient *unversioned.Client) (*podInfo, error) { pod, _ := kubeClient.Pods(podNs).Get(podName) if pod == nil { - return nil, fmt.Errorf("Unable to get POD information") + return nil, fmt.Errorf("unable to get POD information") } node, err := kubeClient.Nodes().Get(pod.Spec.NodeName)