git mv Ingress ingress

controllers/nginx-alpha/Dockerfile

@@ -0,0 +1,18 @@
+# Copyright 2015 The Kubernetes Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM gcr.io/google_containers/nginx
+COPY controller /
+COPY default.conf /etc/nginx/nginx.conf
+CMD ["/controller"]

controllers/nginx-alpha/Makefile

@@ -0,0 +1,17 @@
+all: push
+
+# 0.0 shouldn't clobber any release builds
+TAG = 0.0
+PREFIX = gcr.io/google_containers/nginx-ingress
+
+controller: controller.go
+	CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' -o controller ./controller.go
+
+container: controller
+	docker build -t $(PREFIX):$(TAG) .
+
+push: container
+	gcloud docker push $(PREFIX):$(TAG)
+
+clean:
+	rm -f controller

controllers/nginx-alpha/README.md

@@ -0,0 +1,116 @@
+# Nginx Ingress Controller
+
+This is a simple nginx Ingress controller. Expect it to grow up. See [Ingress controller documentation](../README.md) for details on how it works.
+
+## Deploying the controller
+
+Deploying the controller is as easy as creating the RC in this directory. Having done so you can test it with the following echoheaders application:
+
+```yaml
+# 3 Services for the 3 endpoints of the Ingress
+apiVersion: v1
+kind: Service
+metadata:
+  name: echoheaders-x
+  labels:
+    app: echoheaders
+spec:
+  type: NodePort
+  ports:
+  - port: 80
+    nodePort: 30301
+    targetPort: 8080
+    protocol: TCP
+    name: http
+  selector:
+    app: echoheaders
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: echoheaders-default
+  labels:
+    app: echoheaders
+spec:
+  type: NodePort
+  ports:
+  - port: 80
+    nodePort: 30302
+    targetPort: 8080
+    protocol: TCP
+    name: http
+  selector:
+    app: echoheaders
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: echoheaders-y
+  labels:
+    app: echoheaders
+spec:
+  type: NodePort
+  ports:
+  - port: 80
+    nodePort: 30284
+    targetPort: 8080
+    protocol: TCP
+    name: http
+  selector:
+    app: echoheaders
+---
+# A single RC matching all Services
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: echoheaders
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: echoheaders
+    spec:
+      containers:
+      - name: echoheaders
+        image: gcr.io/google_containers/echoserver:1.0
+        ports:
+        - containerPort: 8080
+---
+# An Ingress with 2 hosts and 3 endpoints
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: echomap
+spec:
+  rules:
+  - host: foo.bar.com
+    http:
+      paths:
+      - path: /foo
+        backend:
+          serviceName: echoheaders-x
+          servicePort: 80
+  - host: bar.baz.com
+    http:
+      paths:
+      - path: /bar
+        backend:
+          serviceName: echoheaders-y
+          servicePort: 80
+      - path: /foo
+        backend:
+          serviceName: echoheaders-x
+          servicePort: 80
+```
+You should be able to access the Services on the public IP of the node the nginx pod lands on.
+
+## Wishlist
+
+* SSL/TLS
+* Production ready options
+* Dynamic adding backends
+* Varied loadbalancing algorithms
+
+... this list goes on. If you feel you know nginx better than I do, please contribute.
+

controllers/nginx-alpha/controller.go

@@ -0,0 +1,95 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"log"
+	"os"
+	"os/exec"
+	"reflect"
+	"text/template"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/kubernetes/pkg/util"
+)
+
+const (
+	nginxConf = `
+events {
+  worker_connections 1024;
+}
+http {
+  # http://nginx.org/en/docs/http/ngx_http_core_module.html
+  types_hash_max_size 2048;
+  server_names_hash_max_size 512;
+  server_names_hash_bucket_size 64;
+
+{{range $ing := .Items}}
+{{range $rule := $ing.Spec.Rules}}
+  server {
+    listen 80;
+    server_name {{$rule.Host}};
+{{ range $path := $rule.HTTP.Paths }}
+    location {{$path.Path}} {
+      proxy_set_header Host $host;
+      proxy_pass http://{{$path.Backend.ServiceName}}.{{$ing.Namespace}}.svc.cluster.local:{{$path.Backend.ServicePort}};
+    }{{end}}
+  }{{end}}{{end}}
+}`
+)
+
+func shellOut(cmd string) {
+	out, err := exec.Command("sh", "-c", cmd).CombinedOutput()
+	if err != nil {
+		log.Fatalf("Failed to execute %v: %v, err: %v", cmd, string(out), err)
+	}
+}
+
+func main() {
+	var ingClient client.IngressInterface
+	if kubeClient, err := client.NewInCluster(); err != nil {
+		log.Fatalf("Failed to create client: %v.", err)
+	} else {
+		ingClient = kubeClient.Extensions().Ingress(api.NamespaceAll)
+	}
+	tmpl, _ := template.New("nginx").Parse(nginxConf)
+	rateLimiter := util.NewTokenBucketRateLimiter(0.1, 1)
+	known := &extensions.IngressList{}
+
+	// Controller loop
+	shellOut("nginx")
+	for {
+		rateLimiter.Accept()
+		ingresses, err := ingClient.List(api.ListOptions{})
+		if err != nil {
+			log.Printf("Error retrieving ingresses: %v", err)
+			continue
+		}
+		if reflect.DeepEqual(ingresses.Items, known.Items) {
+			continue
+		}
+		known = ingresses
+		if w, err := os.Create("/etc/nginx/nginx.conf"); err != nil {
+			log.Fatalf("Failed to open %v: %v", nginxConf, err)
+		} else if err := tmpl.Execute(w, ingresses); err != nil {
+			log.Fatalf("Failed to write template %v", err)
+		}
+		shellOut("nginx -s reload")
+	}
+}

controllers/nginx-alpha/default.conf

@@ -0,0 +1,4 @@
+# A very simple nginx configuration file that forces nginx to start as a daemon.
+events {}
+http {}
+daemon on;

controllers/nginx-alpha/rc.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: nginx-ingress
+  labels:
+    app: nginx-ingress
+spec:
+  replicas: 1
+  selector:
+    app: nginx-ingress
+  template:
+    metadata:
+      labels:
+        app: nginx-ingress
+    spec:
+      containers:
+      - image: gcr.io/google_containers/nginx-ingress:0.1
+        imagePullPolicy: Always
+        name: nginx
+        ports:
+        - containerPort: 80
+          hostPort: 80