From b7dee6f95cd259beca5c0561d20a938009c2ad59 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Sun, 27 Mar 2016 22:12:15 -0300 Subject: [PATCH] Rename controller to nginx --- controllers/{nginx-third-party => nginx}/Dockerfile | 4 ++-- controllers/{nginx-third-party => nginx}/Makefile | 6 +++--- controllers/{nginx-third-party => nginx}/README.md | 0 controllers/{nginx-third-party => nginx}/controller.go | 2 +- controllers/{nginx-third-party => nginx}/default.conf | 0 .../{nginx-third-party => nginx}/examples/as-daemonset.yaml | 4 ++-- .../examples/default-backend.yaml | 0 .../{nginx-third-party => nginx}/examples/dhparam.sh | 0 .../{nginx-third-party => nginx}/examples/ingress.yaml | 0 .../examples/rc-custom-configuration.yaml | 6 +++--- .../{nginx-third-party => nginx}/examples/rc-default.yaml | 6 +++--- .../{nginx-third-party => nginx}/examples/rc-full.yaml | 6 +++--- .../{nginx-third-party => nginx}/examples/rc-ssl.yaml | 6 +++--- .../{nginx-third-party => nginx}/examples/rc-tcp.yaml | 6 +++--- .../examples/tcp-configmap-example.yaml | 0 controllers/{nginx-third-party => nginx}/lua/error_page.lua | 0 controllers/{nginx-third-party => nginx}/lua/trie.lua | 0 .../lua/vendor/lua-resty-http/.gitignore | 0 .../lua/vendor/lua-resty-http/LICENSE | 0 .../lua/vendor/lua-resty-http/Makefile | 0 .../lua/vendor/lua-resty-http/README.md | 0 .../lua/vendor/lua-resty-http/lib/resty/http.lua | 0 .../lua/vendor/lua-resty-http/lib/resty/http_headers.lua | 0 .../vendor/lua-resty-http/lua-resty-http-0.07-0.rockspec | 0 .../lua/vendor/lua-resty-http/t/01-basic.t | 0 .../lua/vendor/lua-resty-http/t/02-chunked.t | 0 .../lua/vendor/lua-resty-http/t/03-requestbody.t | 0 .../lua/vendor/lua-resty-http/t/04-trailers.t | 0 .../lua/vendor/lua-resty-http/t/05-stream.t | 0 .../lua/vendor/lua-resty-http/t/06-simpleinterface.t | 0 .../lua/vendor/lua-resty-http/t/07-keepalive.t | 0 .../lua/vendor/lua-resty-http/t/08-pipeline.t | 0 .../lua/vendor/lua-resty-http/t/09-ssl.t | 0 .../lua/vendor/lua-resty-http/t/10-clientbodyreader.t | 0 .../lua/vendor/lua-resty-http/t/11-proxy.t | 0 .../vendor/lua-resty-http/t/12-case_insensitive_headers.t | 0 .../lua/vendor/lua-resty-http/t/13-default-path.t | 0 .../lua/vendor/lua-resty-http/util/lua-releng | 0 controllers/{nginx-third-party => nginx}/main.go | 2 +- controllers/{nginx-third-party => nginx}/nginx.tmpl | 0 controllers/{nginx-third-party => nginx}/nginx/command.go | 0 controllers/{nginx-third-party => nginx}/nginx/main.go | 0 controllers/{nginx-third-party => nginx}/nginx/nginx.go | 0 controllers/{nginx-third-party => nginx}/nginx/ssl.go | 0 controllers/{nginx-third-party => nginx}/nginx/template.go | 0 controllers/{nginx-third-party => nginx}/nginx/utils.go | 0 controllers/{nginx-third-party => nginx}/utils.go | 0 47 files changed, 24 insertions(+), 24 deletions(-) rename controllers/{nginx-third-party => nginx}/Dockerfile (92%) rename controllers/{nginx-third-party => nginx}/Makefile (68%) rename controllers/{nginx-third-party => nginx}/README.md (100%) rename controllers/{nginx-third-party => nginx}/controller.go (99%) rename controllers/{nginx-third-party => nginx}/default.conf (100%) rename controllers/{nginx-third-party => nginx}/examples/as-daemonset.yaml (91%) rename controllers/{nginx-third-party => nginx}/examples/default-backend.yaml (100%) rename controllers/{nginx-third-party => nginx}/examples/dhparam.sh (100%) rename controllers/{nginx-third-party => nginx}/examples/ingress.yaml (100%) rename controllers/{nginx-third-party => nginx}/examples/rc-custom-configuration.yaml (90%) rename controllers/{nginx-third-party => nginx}/examples/rc-default.yaml (90%) rename controllers/{nginx-third-party => nginx}/examples/rc-full.yaml (91%) rename controllers/{nginx-third-party => nginx}/examples/rc-ssl.yaml (91%) rename controllers/{nginx-third-party => nginx}/examples/rc-tcp.yaml (91%) rename controllers/{nginx-third-party => nginx}/examples/tcp-configmap-example.yaml (100%) rename controllers/{nginx-third-party => nginx}/lua/error_page.lua (100%) rename controllers/{nginx-third-party => nginx}/lua/trie.lua (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/.gitignore (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/LICENSE (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/Makefile (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/README.md (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/lib/resty/http.lua (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/lib/resty/http_headers.lua (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/lua-resty-http-0.07-0.rockspec (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/01-basic.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/02-chunked.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/03-requestbody.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/04-trailers.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/05-stream.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/06-simpleinterface.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/07-keepalive.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/08-pipeline.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/09-ssl.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/10-clientbodyreader.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/11-proxy.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/12-case_insensitive_headers.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/t/13-default-path.t (100%) rename controllers/{nginx-third-party => nginx}/lua/vendor/lua-resty-http/util/lua-releng (100%) rename controllers/{nginx-third-party => nginx}/main.go (98%) rename controllers/{nginx-third-party => nginx}/nginx.tmpl (100%) rename controllers/{nginx-third-party => nginx}/nginx/command.go (100%) rename controllers/{nginx-third-party => nginx}/nginx/main.go (100%) rename controllers/{nginx-third-party => nginx}/nginx/nginx.go (100%) rename controllers/{nginx-third-party => nginx}/nginx/ssl.go (100%) rename controllers/{nginx-third-party => nginx}/nginx/template.go (100%) rename controllers/{nginx-third-party => nginx}/nginx/utils.go (100%) rename controllers/{nginx-third-party => nginx}/utils.go (100%) diff --git a/controllers/nginx-third-party/Dockerfile b/controllers/nginx/Dockerfile similarity index 92% rename from controllers/nginx-third-party/Dockerfile rename to controllers/nginx/Dockerfile index 22981bc15..198c4b3cb 100644 --- a/controllers/nginx-third-party/Dockerfile +++ b/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"] diff --git a/controllers/nginx-third-party/Makefile b/controllers/nginx/Makefile similarity index 68% rename from controllers/nginx-third-party/Makefile rename to controllers/nginx/Makefile index 7715248a9..4b2c6a95c 100644 --- a/controllers/nginx-third-party/Makefile +++ b/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 diff --git a/controllers/nginx-third-party/README.md b/controllers/nginx/README.md similarity index 100% rename from controllers/nginx-third-party/README.md rename to controllers/nginx/README.md diff --git a/controllers/nginx-third-party/controller.go b/controllers/nginx/controller.go similarity index 99% rename from controllers/nginx-third-party/controller.go rename to controllers/nginx/controller.go index b91778950..e5c064284 100644 --- a/controllers/nginx-third-party/controller.go +++ b/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 ( diff --git a/controllers/nginx-third-party/default.conf b/controllers/nginx/default.conf similarity index 100% rename from controllers/nginx-third-party/default.conf rename to controllers/nginx/default.conf diff --git a/controllers/nginx-third-party/examples/as-daemonset.yaml b/controllers/nginx/examples/as-daemonset.yaml similarity index 91% rename from controllers/nginx-third-party/examples/as-daemonset.yaml rename to controllers/nginx/examples/as-daemonset.yaml index c0050fefb..a2282a44b 100644 --- a/controllers/nginx-third-party/examples/as-daemonset.yaml +++ b/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 diff --git a/controllers/nginx-third-party/examples/default-backend.yaml b/controllers/nginx/examples/default-backend.yaml similarity index 100% rename from controllers/nginx-third-party/examples/default-backend.yaml rename to controllers/nginx/examples/default-backend.yaml diff --git a/controllers/nginx-third-party/examples/dhparam.sh b/controllers/nginx/examples/dhparam.sh similarity index 100% rename from controllers/nginx-third-party/examples/dhparam.sh rename to controllers/nginx/examples/dhparam.sh diff --git a/controllers/nginx-third-party/examples/ingress.yaml b/controllers/nginx/examples/ingress.yaml similarity index 100% rename from controllers/nginx-third-party/examples/ingress.yaml rename to controllers/nginx/examples/ingress.yaml diff --git a/controllers/nginx-third-party/examples/rc-custom-configuration.yaml b/controllers/nginx/examples/rc-custom-configuration.yaml similarity index 90% rename from controllers/nginx-third-party/examples/rc-custom-configuration.yaml rename to controllers/nginx/examples/rc-custom-configuration.yaml index 316bfa75f..10bc7bf1c 100644 --- a/controllers/nginx-third-party/examples/rc-custom-configuration.yaml +++ b/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 diff --git a/controllers/nginx-third-party/examples/rc-default.yaml b/controllers/nginx/examples/rc-default.yaml similarity index 90% rename from controllers/nginx-third-party/examples/rc-default.yaml rename to controllers/nginx/examples/rc-default.yaml index bec7b0648..4594bd1f6 100644 --- a/controllers/nginx-third-party/examples/rc-default.yaml +++ b/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 diff --git a/controllers/nginx-third-party/examples/rc-full.yaml b/controllers/nginx/examples/rc-full.yaml similarity index 91% rename from controllers/nginx-third-party/examples/rc-full.yaml rename to controllers/nginx/examples/rc-full.yaml index 38b1305ee..2e406f7f4 100644 --- a/controllers/nginx-third-party/examples/rc-full.yaml +++ b/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 diff --git a/controllers/nginx-third-party/examples/rc-ssl.yaml b/controllers/nginx/examples/rc-ssl.yaml similarity index 91% rename from controllers/nginx-third-party/examples/rc-ssl.yaml rename to controllers/nginx/examples/rc-ssl.yaml index f6f5c1042..16c8b7a59 100644 --- a/controllers/nginx-third-party/examples/rc-ssl.yaml +++ b/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 diff --git a/controllers/nginx-third-party/examples/rc-tcp.yaml b/controllers/nginx/examples/rc-tcp.yaml similarity index 91% rename from controllers/nginx-third-party/examples/rc-tcp.yaml rename to controllers/nginx/examples/rc-tcp.yaml index 9ca1cf5da..61e6b7a37 100644 --- a/controllers/nginx-third-party/examples/rc-tcp.yaml +++ b/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 diff --git a/controllers/nginx-third-party/examples/tcp-configmap-example.yaml b/controllers/nginx/examples/tcp-configmap-example.yaml similarity index 100% rename from controllers/nginx-third-party/examples/tcp-configmap-example.yaml rename to controllers/nginx/examples/tcp-configmap-example.yaml diff --git a/controllers/nginx-third-party/lua/error_page.lua b/controllers/nginx/lua/error_page.lua similarity index 100% rename from controllers/nginx-third-party/lua/error_page.lua rename to controllers/nginx/lua/error_page.lua diff --git a/controllers/nginx-third-party/lua/trie.lua b/controllers/nginx/lua/trie.lua similarity index 100% rename from controllers/nginx-third-party/lua/trie.lua rename to controllers/nginx/lua/trie.lua diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/.gitignore b/controllers/nginx/lua/vendor/lua-resty-http/.gitignore similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/.gitignore rename to controllers/nginx/lua/vendor/lua-resty-http/.gitignore diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/LICENSE b/controllers/nginx/lua/vendor/lua-resty-http/LICENSE similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/LICENSE rename to controllers/nginx/lua/vendor/lua-resty-http/LICENSE diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/Makefile b/controllers/nginx/lua/vendor/lua-resty-http/Makefile similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/Makefile rename to controllers/nginx/lua/vendor/lua-resty-http/Makefile diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/README.md b/controllers/nginx/lua/vendor/lua-resty-http/README.md similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/README.md rename to controllers/nginx/lua/vendor/lua-resty-http/README.md diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/lib/resty/http.lua b/controllers/nginx/lua/vendor/lua-resty-http/lib/resty/http.lua similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/lib/resty/http.lua rename to controllers/nginx/lua/vendor/lua-resty-http/lib/resty/http.lua diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/lib/resty/http_headers.lua b/controllers/nginx/lua/vendor/lua-resty-http/lib/resty/http_headers.lua similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/lib/resty/http_headers.lua rename to controllers/nginx/lua/vendor/lua-resty-http/lib/resty/http_headers.lua diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/lua-resty-http-0.07-0.rockspec b/controllers/nginx/lua/vendor/lua-resty-http/lua-resty-http-0.07-0.rockspec similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/lua-resty-http-0.07-0.rockspec rename to controllers/nginx/lua/vendor/lua-resty-http/lua-resty-http-0.07-0.rockspec diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/01-basic.t b/controllers/nginx/lua/vendor/lua-resty-http/t/01-basic.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/01-basic.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/01-basic.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/02-chunked.t b/controllers/nginx/lua/vendor/lua-resty-http/t/02-chunked.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/02-chunked.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/02-chunked.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/03-requestbody.t b/controllers/nginx/lua/vendor/lua-resty-http/t/03-requestbody.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/03-requestbody.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/03-requestbody.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/04-trailers.t b/controllers/nginx/lua/vendor/lua-resty-http/t/04-trailers.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/04-trailers.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/04-trailers.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/05-stream.t b/controllers/nginx/lua/vendor/lua-resty-http/t/05-stream.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/05-stream.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/05-stream.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/06-simpleinterface.t b/controllers/nginx/lua/vendor/lua-resty-http/t/06-simpleinterface.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/06-simpleinterface.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/06-simpleinterface.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/07-keepalive.t b/controllers/nginx/lua/vendor/lua-resty-http/t/07-keepalive.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/07-keepalive.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/07-keepalive.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/08-pipeline.t b/controllers/nginx/lua/vendor/lua-resty-http/t/08-pipeline.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/08-pipeline.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/08-pipeline.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/09-ssl.t b/controllers/nginx/lua/vendor/lua-resty-http/t/09-ssl.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/09-ssl.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/09-ssl.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/10-clientbodyreader.t b/controllers/nginx/lua/vendor/lua-resty-http/t/10-clientbodyreader.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/10-clientbodyreader.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/10-clientbodyreader.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/11-proxy.t b/controllers/nginx/lua/vendor/lua-resty-http/t/11-proxy.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/11-proxy.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/11-proxy.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/12-case_insensitive_headers.t b/controllers/nginx/lua/vendor/lua-resty-http/t/12-case_insensitive_headers.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/12-case_insensitive_headers.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/12-case_insensitive_headers.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/t/13-default-path.t b/controllers/nginx/lua/vendor/lua-resty-http/t/13-default-path.t similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/t/13-default-path.t rename to controllers/nginx/lua/vendor/lua-resty-http/t/13-default-path.t diff --git a/controllers/nginx-third-party/lua/vendor/lua-resty-http/util/lua-releng b/controllers/nginx/lua/vendor/lua-resty-http/util/lua-releng similarity index 100% rename from controllers/nginx-third-party/lua/vendor/lua-resty-http/util/lua-releng rename to controllers/nginx/lua/vendor/lua-resty-http/util/lua-releng diff --git a/controllers/nginx-third-party/main.go b/controllers/nginx/main.go similarity index 98% rename from controllers/nginx-third-party/main.go rename to controllers/nginx/main.go index 766785dfb..7149dac53 100644 --- a/controllers/nginx-third-party/main.go +++ b/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" diff --git a/controllers/nginx-third-party/nginx.tmpl b/controllers/nginx/nginx.tmpl similarity index 100% rename from controllers/nginx-third-party/nginx.tmpl rename to controllers/nginx/nginx.tmpl diff --git a/controllers/nginx-third-party/nginx/command.go b/controllers/nginx/nginx/command.go similarity index 100% rename from controllers/nginx-third-party/nginx/command.go rename to controllers/nginx/nginx/command.go diff --git a/controllers/nginx-third-party/nginx/main.go b/controllers/nginx/nginx/main.go similarity index 100% rename from controllers/nginx-third-party/nginx/main.go rename to controllers/nginx/nginx/main.go diff --git a/controllers/nginx-third-party/nginx/nginx.go b/controllers/nginx/nginx/nginx.go similarity index 100% rename from controllers/nginx-third-party/nginx/nginx.go rename to controllers/nginx/nginx/nginx.go diff --git a/controllers/nginx-third-party/nginx/ssl.go b/controllers/nginx/nginx/ssl.go similarity index 100% rename from controllers/nginx-third-party/nginx/ssl.go rename to controllers/nginx/nginx/ssl.go diff --git a/controllers/nginx-third-party/nginx/template.go b/controllers/nginx/nginx/template.go similarity index 100% rename from controllers/nginx-third-party/nginx/template.go rename to controllers/nginx/nginx/template.go diff --git a/controllers/nginx-third-party/nginx/utils.go b/controllers/nginx/nginx/utils.go similarity index 100% rename from controllers/nginx-third-party/nginx/utils.go rename to controllers/nginx/nginx/utils.go diff --git a/controllers/nginx-third-party/utils.go b/controllers/nginx/utils.go similarity index 100% rename from controllers/nginx-third-party/utils.go rename to controllers/nginx/utils.go