Rename controller to nginx

controllers/nginx/Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y \
   --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
-COPY nginx-third-party-lb /
+COPY nginx-ingress-controller /
 COPY nginx.tmpl /
 COPY default.conf /etc/nginx/nginx.conf
 
@@ -27,4 +27,4 @@ COPY lua /etc/nginx/lua/
 
 WORKDIR /
 
-CMD ["/nginx-third-party-lb"]
+CMD ["/nginx-ingress-controller"]

controllers/nginx/Makefile

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

controllers/nginx/controller.go

@@ -36,7 +36,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/intstr"
 	"k8s.io/kubernetes/pkg/watch"
 
-	"k8s.io/contrib/ingress/controllers/nginx-third-party/nginx"
+	"k8s.io/contrib/ingress/controllers/nginx/nginx"
 )
 
 const (

controllers/nginx/examples/as-daemonset.yaml

@@ -9,7 +9,7 @@ spec:
         name: nginx-ingress-lb
     spec:
       containers:
-      - image: gcr.io/google_containers/nginx-third-party::0.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.4
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
@@ -43,5 +43,5 @@ spec:
         - containerPort: 8080
           hostPort: 8081
         args:
-        - /nginx-third-party-lb
+        - /nginx-ingress-controller-lb
         - --default-backend-service=default/default-http-backend

controllers/nginx/examples/rc-custom-configuration.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: nginx-ingress-3rdpartycfg
+  name: nginx-ingress-controller
   labels:
     k8s-app: nginx-ingress-lb
 spec:
@@ -15,7 +15,7 @@ spec:
         name: nginx-ingress-lb
     spec:
       containers:
-      - image: gcr.io/google_containers/nginx-third-party:0.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.4
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
@@ -49,6 +49,6 @@ spec:
         - containerPort: 8080
           hostPort: 8081
         args:
-        - /nginx-third-party-lb
+        - /nginx-ingress-controller
         - --default-backend-service=default/default-http-backend
         - --nginx-configmap=default/nginx-load-balancer-conf

controllers/nginx/examples/rc-default.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: nginx-ingress-3rdpartycfg
+  name: nginx-ingress-controller
   labels:
     k8s-app: nginx-ingress-lb
 spec:
@@ -15,7 +15,7 @@ spec:
         name: nginx-ingress-lb
     spec:
       containers:
-      - image: gcr.io/google_containers/nginx-third-party:0.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.4
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
@@ -49,5 +49,5 @@ spec:
         - containerPort: 8080
           hostPort: 8081
         args:
-        - /nginx-third-party-lb
+        - /nginx-ingress-controller
         - --default-backend-service=default/default-http-backend

controllers/nginx/examples/rc-full.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: nginx-ingress-3rdpartycfg
+  name: nginx-ingress-controller
   labels:
     k8s-app: nginx-ingress-lb
 spec:
@@ -20,7 +20,7 @@ spec:
         secret:
           secretName: dhparam-example
       containers:
-      - image: gcr.io/google_containers/nginx-third-party:0.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.4
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
@@ -55,6 +55,6 @@ spec:
         - mountPath: /etc/nginx-ssl/dhparam
           name: dhparam-example
         args:
-        - /nginx-third-party-lb
+        - /nginx-ingress-controller
         - --tcp-services-configmap=default/tcp-configmap-example
         - --default-backend-service=default/default-http-backend

controllers/nginx/examples/rc-ssl.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: nginx-ingress-3rdpartycfg
+  name: nginx-ingress-controller
   labels:
     k8s-app: nginx-ingress-lb
 spec:
@@ -15,7 +15,7 @@ spec:
         name: nginx-ingress-lb
     spec:
       containers:
-      - image: gcr.io/google_containers/nginx-third-party:0.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.4
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
@@ -50,5 +50,5 @@ spec:
         # use the dhparam.sh file to generate and mount a secret that containing the key dhparam.pem or
         # create a configuration with the content of dhparam.pem in the field sslDHParam.
         args:
-        - /nginx-third-party-lb
+        - /nginx-ingress-controller
         - --default-backend-service=default/default-http-backend

controllers/nginx/examples/rc-tcp.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: nginx-ingress-3rdpartycfg
+  name: nginx-ingress-controller
   labels:
     k8s-app: nginx-ingress-lb
 spec:
@@ -15,7 +15,7 @@ spec:
         name: nginx-ingress-lb
     spec:
       containers:
-      - image: gcr.io/google_containers/nginx-third-party:0.4
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.4
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
@@ -53,6 +53,6 @@ spec:
         - containerPort: 9000
           hostPort: 9000
         args:
-        - /nginx-third-party-lb
+        - /nginx-ingress-controller
         - --default-backend-service=default/default-http-backend
         - --tcp-services-configmap=default/tcp-configmap-example

controllers/nginx/main.go

@@ -27,7 +27,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
 
-	"k8s.io/contrib/ingress/controllers/nginx-third-party/nginx"
+	"k8s.io/contrib/ingress/controllers/nginx/nginx"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/unversioned"