Refactor go packages

Makefile

@@ -20,7 +20,7 @@ ifndef COMMIT
   COMMIT := git-$(shell git rev-parse --short HEAD)
 endif
 
-PKG=k8s.io/ingress/controllers/nginx
+PKG=k8s.io/ingress-nginx
 
 ARCH ?= $(shell go env GOARCH)
 GOARCH = ${ARCH}
@@ -107,8 +107,8 @@ clean:
 
 build: clean
 	CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -a -installsuffix cgo \
-		-ldflags "-s -w -X ${PKG}/pkg/version.RELEASE=${TAG} -X ${PKG}/pkg/version.COMMIT=${COMMIT} -X ${PKG}/pkg/version.REPO=${REPO_INFO}" \
+		-ldflags "-s -w -X ${PKG}/version.RELEASE=${TAG} -X ${PKG}/version.COMMIT=${COMMIT} -X ${PKG}/version.REPO=${REPO_INFO}" \
-		-o ${TEMP_DIR}/rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller
+		-o ${TEMP_DIR}/rootfs/nginx-ingress-controller ${PKG}/cmd/nginx
 
 fmt:
 	@echo "+ $@"
@@ -134,3 +134,9 @@ vet:
 
 release: all-container all-push
 	echo "done"
+
+.PHONY: docker-build 
+docker-build: all-container
+
+.PHONY: docker-push 
+docker-push: all-push 

cmd/nginx/metrics.go

@@ -20,7 +20,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"k8s.io/ingress/controllers/nginx/pkg/metric/collector"
+	"k8s.io/ingress-nginx/metric/collector"
 )
 
 const (

cmd/nginx/nginx.go

@@ -39,14 +39,14 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/controllers/nginx/pkg/config"
+	"k8s.io/ingress-nginx/config"
-	ngx_template "k8s.io/ingress/controllers/nginx/pkg/template"
+	ngx_template "k8s.io/ingress-nginx/template"
-	"k8s.io/ingress/controllers/nginx/pkg/version"
+	"k8s.io/ingress-nginx/version"
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/controller"
+	"k8s.io/ingress-nginx/ingress/controller"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
-	"k8s.io/ingress/core/pkg/net/dns"
+	"k8s.io/ingress-nginx/net/dns"
-	"k8s.io/ingress/core/pkg/net/ssl"
+	"k8s.io/ingress-nginx/net/ssl"
 )
 
 type statusModule string

config/config.go

@@ -25,8 +25,8 @@ import (
 
 	apiv1 "k8s.io/api/core/v1"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 const (

examples/custom-controller/Dockerfile

@@ -1,20 +0,0 @@
-# Copyright 2017 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.
-
-# TODO(ingress#191): Change this to something more appropriate, like busybox
-From ubuntu:15.10
-MAINTAINER Prashanth B <beeps@google.com>
-RUN apt-get update && apt-get install ssl-cert -y
-COPY server /
-ENTRYPOINT ["/server"]

examples/custom-controller/Makefile

@@ -1,39 +0,0 @@
-# Copyright 2017 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.
-
-# Build the default backend binary or image for amd64, arm, arm64 and ppc64le
-#
-# Usage:
-# 	[PREFIX=gcr.io/google_containers/dummy-ingress-controller] [ARCH=amd64] [TAG=1.1] make (server|container|push)
-
-all: push
-
-TAG=0.1
-PREFIX?=bprashanth/dummy-ingress-controller
-ARCH?=amd64
-GOLANG_VERSION=1.6
-TEMP_DIR:=$(shell mktemp -d)
-
-server: server.go
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) GOARM=6 godep go build -a -installsuffix cgo -ldflags '-w' -o server ./server.go
-
-container: server
-	docker build --pull -t $(PREFIX)-$(ARCH):$(TAG) .
-
-push: container
-	gcloud docker -- push $(PREFIX)-$(ARCH):$(TAG)
-
-clean:
-	rm -f server
-

examples/custom-controller/README.md

@@ -1,29 +0,0 @@
-# Dummy controller
-
-This example contains the source code of a simple dummy controller. If you want
-more details on the interface, or what the generic controller is actually doing,
-please read [this doc](/docs/dev/getting-started.md). You can deploy the controller as
-follows:
-
-```console
-$ kubectl create -f deployment.yaml
-service "default-backend" created
-deployment "dummy-ingress-controller" created
-
-$ kubectl get po
-NAME                                        READY     STATUS    RESTARTS   AGE
-dummy-ingress-controller-3685541482-082nl   1/1       Running   0          10m
-
-$ kubectl logs dummy-ingress-controller-3685541482-082nl
-I0131 02:29:02.462123       1 launch.go:92] &{dummy 0.0.0 git-00000000 git://foo.bar.com}
-I0131 02:29:02.462513       1 launch.go:221] Creating API server client for https://10.0.0.1:443
-I0131 02:29:02.494571       1 launch.go:111] validated default/default-backend as the default backend
-I0131 02:29:02.503180       1 controller.go:1038] starting Ingress controller
-I0131 02:29:02.513528       1 leaderelection.go:247] lock is held by dummy-ingress-controller-3685541482-50jh0 and has not yet expired
-W0131 02:29:03.510699       1 queue.go:87] requeuing kube-system/kube-scheduler, err deferring sync till endpoints controller has synced
-W0131 02:29:03.514445       1 queue.go:87] requeuing kube-system/node-controller-token-826dl, err deferring sync till endpoints controller has synced
-2017/01/31 02:29:12 Received OnUpdate notification
-2017/01/31 02:29:12 upstream-default-backend: 10.180.1.20
-```
-
-

examples/custom-controller/deployment.yaml

@@ -1,51 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: default-backend
-  namespace: default
-  labels:
-    name: default-backend
-    app: dummy-ingress-controller
-spec:
-  ports:
-  - port: 80
-    targetPort: 10254
-  selector:
-    # Point back the the dummy controller's
-    # healthz port
-    app: dummy-ingress-controller
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: dummy-ingress-controller
-  namespace: default
-  labels:
-    app: dummy-ingress-controller
-spec:
-  selector:
-    matchLabels:
-      app: dummy-ingress-controller
-  template:
-    metadata:
-      labels:
-        app: dummy-ingress-controller
-    spec:
-      containers:
-      - name: server
-        image: bprashanth/dummy-ingress-controller-amd64:0.1
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 10254
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-        args:
-        - /server
-        - --default-backend-service=$(POD_NAMESPACE)/default-backend

examples/custom-controller/server.go

@@ -27,10 +27,10 @@ import (
 	api "k8s.io/api/core/v1"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	nginxconfig "k8s.io/ingress/controllers/nginx/pkg/config"
+	nginxconfig "k8s.io/ingress-nginx/config"
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/controller"
+	"k8s.io/ingress-nginx/ingress/controller"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 func main() {

ingress/annotations/alias/main.go

@@ -19,7 +19,7 @@ package alias
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/auth/main.go

@@ -27,10 +27,10 @@ import (
 	api "k8s.io/api/core/v1"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/file"
+	"k8s.io/ingress-nginx/file"
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
+	ing_errors "k8s.io/ingress-nginx/ingress/errors"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/authreq/main.go

@@ -23,8 +23,8 @@ import (
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
+	ing_errors "k8s.io/ingress-nginx/ingress/errors"
 )
 
 const (

ingress/annotations/authtls/main.go

@@ -20,10 +20,10 @@ import (
 	"github.com/pkg/errors"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
+	ing_errors "k8s.io/ingress-nginx/ingress/errors"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
-	"k8s.io/ingress/core/pkg/k8s"
+	"k8s.io/ingress-nginx/k8s"
 	"regexp"
 )
 

ingress/annotations/class/main.go

@@ -20,8 +20,8 @@ import (
 	"github.com/golang/glog"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/errors"
+	"k8s.io/ingress-nginx/ingress/errors"
 )
 
 const (

ingress/annotations/clientbodybuffersize/main.go

@@ -19,7 +19,7 @@ package clientbodybuffersize
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/cors/main.go

@@ -19,7 +19,7 @@ package cors
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/defaultbackend/main.go

@@ -22,8 +22,8 @@ import (
 	"github.com/pkg/errors"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/healthcheck/main.go

@@ -19,8 +19,8 @@ package healthcheck
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/healthcheck/main_test.go

@@ -24,7 +24,7 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 func buildIngress() *extensions.Ingress {

ingress/annotations/ipwhitelist/main.go

@@ -23,11 +23,11 @@ import (
 	"github.com/pkg/errors"
 
 	extensions "k8s.io/api/extensions/v1beta1"
-	"k8s.io/ingress/core/pkg/net"
+	"k8s.io/ingress-nginx/net"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
+	ing_errors "k8s.io/ingress-nginx/ingress/errors"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/ipwhitelist/main_test.go

@@ -24,7 +24,7 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 func buildIngress() *extensions.Ingress {

ingress/annotations/parser/main.go

@@ -21,7 +21,7 @@ import (
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/errors"
+	"k8s.io/ingress-nginx/ingress/errors"
 )
 
 // IngressAnnotation has a method to parse annotations located in Ingress

ingress/annotations/portinredirect/main.go

@@ -19,8 +19,8 @@ package portinredirect
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/portinredirect/main_test.go

@@ -26,7 +26,7 @@ import (
 
 	"fmt"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 func buildIngress() *extensions.Ingress {

ingress/annotations/proxy/main.go

@@ -19,8 +19,8 @@ package proxy
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/proxy/main_test.go

@@ -24,7 +24,7 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 func buildIngress() *extensions.Ingress {

ingress/annotations/ratelimit/main.go

@@ -24,9 +24,9 @@ import (
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
-	"k8s.io/ingress/core/pkg/net"
+	"k8s.io/ingress-nginx/net"
 )
 
 const (

ingress/annotations/ratelimit/main_test.go

@@ -24,7 +24,7 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 func buildIngress() *extensions.Ingress {

ingress/annotations/redirect/redirect.go

@@ -23,8 +23,8 @@ import (
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/errors"
+	"k8s.io/ingress-nginx/ingress/errors"
 )
 
 const (

ingress/annotations/rewrite/main.go

@@ -19,8 +19,8 @@ package rewrite
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/rewrite/main_test.go

@@ -24,7 +24,7 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 const (

ingress/annotations/secureupstream/main.go

@@ -22,8 +22,8 @@ import (
 	"github.com/pkg/errors"
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/annotations/secureupstream/main_test.go

@@ -26,7 +26,7 @@ import (
 	"fmt"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 func buildIngress() *extensions.Ingress {

ingress/annotations/serversnippet/main.go

@@ -19,7 +19,7 @@ package serversnippet
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/serviceupstream/main.go

@@ -18,7 +18,7 @@ package serviceupstream
 
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/sessionaffinity/main.go

@@ -23,7 +23,7 @@ import (
 
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/snippet/main.go

@@ -19,7 +19,7 @@ package snippet
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/sslpassthrough/main.go

@@ -19,8 +19,8 @@ package sslpassthrough
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
+	ing_errors "k8s.io/ingress-nginx/ingress/errors"
 )
 
 const (

ingress/annotations/upstreamvhost/main.go

@@ -19,7 +19,7 @@ package upstreamvhost
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/annotations/vtsfilterkey/main.go

@@ -19,7 +19,7 @@ package vtsfilterkey
 import (
 	extensions "k8s.io/api/extensions/v1beta1"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 const (

ingress/controller/annotations.go

@@ -20,31 +20,31 @@ import (
 	"github.com/golang/glog"
 
 	extensions "k8s.io/api/extensions/v1beta1"
-	"k8s.io/ingress/core/pkg/ingress/annotations/alias"
+	"k8s.io/ingress-nginx/ingress/annotations/alias"
-	"k8s.io/ingress/core/pkg/ingress/annotations/auth"
+	"k8s.io/ingress-nginx/ingress/annotations/auth"
-	"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
+	"k8s.io/ingress-nginx/ingress/annotations/authreq"
-	"k8s.io/ingress/core/pkg/ingress/annotations/authtls"
+	"k8s.io/ingress-nginx/ingress/annotations/authtls"
-	"k8s.io/ingress/core/pkg/ingress/annotations/clientbodybuffersize"
+	"k8s.io/ingress-nginx/ingress/annotations/clientbodybuffersize"
-	"k8s.io/ingress/core/pkg/ingress/annotations/cors"
+	"k8s.io/ingress-nginx/ingress/annotations/cors"
-	"k8s.io/ingress/core/pkg/ingress/annotations/defaultbackend"
+	"k8s.io/ingress-nginx/ingress/annotations/defaultbackend"
-	"k8s.io/ingress/core/pkg/ingress/annotations/healthcheck"
+	"k8s.io/ingress-nginx/ingress/annotations/healthcheck"
-	"k8s.io/ingress/core/pkg/ingress/annotations/ipwhitelist"
+	"k8s.io/ingress-nginx/ingress/annotations/ipwhitelist"
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/annotations/portinredirect"
+	"k8s.io/ingress-nginx/ingress/annotations/portinredirect"
-	"k8s.io/ingress/core/pkg/ingress/annotations/proxy"
+	"k8s.io/ingress-nginx/ingress/annotations/proxy"
-	"k8s.io/ingress/core/pkg/ingress/annotations/ratelimit"
+	"k8s.io/ingress-nginx/ingress/annotations/ratelimit"
-	"k8s.io/ingress/core/pkg/ingress/annotations/redirect"
+	"k8s.io/ingress-nginx/ingress/annotations/redirect"
-	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
+	"k8s.io/ingress-nginx/ingress/annotations/rewrite"
-	"k8s.io/ingress/core/pkg/ingress/annotations/secureupstream"
+	"k8s.io/ingress-nginx/ingress/annotations/secureupstream"
-	"k8s.io/ingress/core/pkg/ingress/annotations/serversnippet"
+	"k8s.io/ingress-nginx/ingress/annotations/serversnippet"
-	"k8s.io/ingress/core/pkg/ingress/annotations/serviceupstream"
+	"k8s.io/ingress-nginx/ingress/annotations/serviceupstream"
-	"k8s.io/ingress/core/pkg/ingress/annotations/sessionaffinity"
+	"k8s.io/ingress-nginx/ingress/annotations/sessionaffinity"
-	"k8s.io/ingress/core/pkg/ingress/annotations/snippet"
+	"k8s.io/ingress-nginx/ingress/annotations/snippet"
-	"k8s.io/ingress/core/pkg/ingress/annotations/sslpassthrough"
+	"k8s.io/ingress-nginx/ingress/annotations/sslpassthrough"
-	"k8s.io/ingress/core/pkg/ingress/annotations/upstreamvhost"
+	"k8s.io/ingress-nginx/ingress/annotations/upstreamvhost"
-	"k8s.io/ingress/core/pkg/ingress/annotations/vtsfilterkey"
+	"k8s.io/ingress-nginx/ingress/annotations/vtsfilterkey"
-	"k8s.io/ingress/core/pkg/ingress/errors"
+	"k8s.io/ingress-nginx/ingress/errors"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 type extractorConfig interface {

ingress/controller/annotations_test.go

@@ -24,8 +24,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
 )
 
 const (

ingress/controller/backend_ssl.go

@@ -27,10 +27,10 @@ import (
 	extensions "k8s.io/api/extensions/v1beta1"
 	"k8s.io/client-go/tools/cache"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/annotations/class"
+	"k8s.io/ingress-nginx/ingress/annotations/class"
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/net/ssl"
+	"k8s.io/ingress-nginx/net/ssl"
 )
 
 // syncSecret keeps in sync Secrets used by Ingress rules with the files on

ingress/controller/backend_ssl_test.go

@@ -28,9 +28,9 @@ import (
 	cache_client "k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/flowcontrol"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/store"
+	"k8s.io/ingress-nginx/ingress/store"
-	"k8s.io/ingress/core/pkg/task"
+	"k8s.io/ingress-nginx/task"
 	"k8s.io/kubernetes/pkg/api"
 )
 

ingress/controller/controller.go

@@ -42,18 +42,18 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/flowcontrol"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/annotations/class"
+	"k8s.io/ingress-nginx/ingress/annotations/class"
-	"k8s.io/ingress/core/pkg/ingress/annotations/healthcheck"
+	"k8s.io/ingress-nginx/ingress/annotations/healthcheck"
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
-	"k8s.io/ingress/core/pkg/ingress/annotations/proxy"
+	"k8s.io/ingress-nginx/ingress/annotations/proxy"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
-	"k8s.io/ingress/core/pkg/ingress/status"
+	"k8s.io/ingress-nginx/ingress/status"
-	"k8s.io/ingress/core/pkg/k8s"
+	"k8s.io/ingress-nginx/k8s"
-	"k8s.io/ingress/core/pkg/net/ssl"
+	"k8s.io/ingress-nginx/net/ssl"
-	local_strings "k8s.io/ingress/core/pkg/strings"
+	local_strings "k8s.io/ingress-nginx/strings"
-	"k8s.io/ingress/core/pkg/task"
+	"k8s.io/ingress-nginx/task"
 )
 
 const (

ingress/controller/launch.go

@@ -23,8 +23,8 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/k8s"
+	"k8s.io/ingress-nginx/k8s"
 )
 
 // NewIngressController returns a configured Ingress controller

ingress/controller/listers.go

@@ -29,9 +29,9 @@ import (
 	"k8s.io/client-go/tools/cache"
 	fcache "k8s.io/client-go/tools/cache/testing"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/annotations/class"
+	"k8s.io/ingress-nginx/ingress/annotations/class"
-	"k8s.io/ingress/core/pkg/ingress/annotations/parser"
+	"k8s.io/ingress-nginx/ingress/annotations/parser"
 )
 
 type cacheController struct {

ingress/controller/metrics.go

@@ -19,7 +19,7 @@ package controller
 import (
 	"github.com/prometheus/client_golang/prometheus"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
 )
 
 const (

ingress/controller/util.go

@@ -23,7 +23,7 @@ import (
 
 	api "k8s.io/api/core/v1"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
 )
 
 // DeniedKeyName name of the key that contains the reason to deny a location

ingress/controller/util_test.go

@@ -20,14 +20,14 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
-	"k8s.io/ingress/core/pkg/ingress/annotations/auth"
+	"k8s.io/ingress-nginx/ingress/annotations/auth"
-	"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
+	"k8s.io/ingress-nginx/ingress/annotations/authreq"
-	"k8s.io/ingress/core/pkg/ingress/annotations/ipwhitelist"
+	"k8s.io/ingress-nginx/ingress/annotations/ipwhitelist"
-	"k8s.io/ingress/core/pkg/ingress/annotations/proxy"
+	"k8s.io/ingress-nginx/ingress/annotations/proxy"
-	"k8s.io/ingress/core/pkg/ingress/annotations/ratelimit"
+	"k8s.io/ingress-nginx/ingress/annotations/ratelimit"
-	"k8s.io/ingress/core/pkg/ingress/annotations/redirect"
+	"k8s.io/ingress-nginx/ingress/annotations/redirect"
-	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
+	"k8s.io/ingress-nginx/ingress/annotations/rewrite"
 )
 
 type fakeError struct{}

ingress/resolver/main.go

@@ -19,7 +19,7 @@ package resolver
 import (
 	apiv1 "k8s.io/api/core/v1"
 
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
 )
 
 // DefaultBackend has a method that returns the backend

ingress/status/status.go

@@ -39,11 +39,11 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/class"
+	"k8s.io/ingress-nginx/ingress/annotations/class"
-	"k8s.io/ingress/core/pkg/ingress/store"
+	"k8s.io/ingress-nginx/ingress/store"
-	"k8s.io/ingress/core/pkg/k8s"
+	"k8s.io/ingress-nginx/k8s"
-	ingress_strings "k8s.io/ingress/core/pkg/strings"
+	ingress_strings "k8s.io/ingress-nginx/strings"
-	"k8s.io/ingress/core/pkg/task"
+	"k8s.io/ingress-nginx/task"
 )
 
 const (

ingress/status/status_test.go

@@ -28,10 +28,10 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/kubernetes/pkg/api"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/class"
+	"k8s.io/ingress-nginx/ingress/annotations/class"
-	"k8s.io/ingress/core/pkg/ingress/store"
+	"k8s.io/ingress-nginx/ingress/store"
-	"k8s.io/ingress/core/pkg/k8s"
+	"k8s.io/ingress-nginx/k8s"
-	"k8s.io/ingress/core/pkg/task"
+	"k8s.io/ingress-nginx/task"
 )
 
 func buildLoadBalancerIngressByIP() []apiv1.LoadBalancerIngress {

ingress/types.go

@@ -26,17 +26,17 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apiserver/pkg/server/healthz"
 
-	"k8s.io/ingress/core/pkg/ingress/annotations/auth"
+	"k8s.io/ingress-nginx/ingress/annotations/auth"
-	"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
+	"k8s.io/ingress-nginx/ingress/annotations/authreq"
-	"k8s.io/ingress/core/pkg/ingress/annotations/authtls"
+	"k8s.io/ingress-nginx/ingress/annotations/authtls"
-	"k8s.io/ingress/core/pkg/ingress/annotations/ipwhitelist"
+	"k8s.io/ingress-nginx/ingress/annotations/ipwhitelist"
-	"k8s.io/ingress/core/pkg/ingress/annotations/proxy"
+	"k8s.io/ingress-nginx/ingress/annotations/proxy"
-	"k8s.io/ingress/core/pkg/ingress/annotations/ratelimit"
+	"k8s.io/ingress-nginx/ingress/annotations/ratelimit"
-	"k8s.io/ingress/core/pkg/ingress/annotations/redirect"
+	"k8s.io/ingress-nginx/ingress/annotations/redirect"
-	"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
+	"k8s.io/ingress-nginx/ingress/annotations/rewrite"
-	"k8s.io/ingress/core/pkg/ingress/defaults"
+	"k8s.io/ingress-nginx/ingress/defaults"
-	"k8s.io/ingress/core/pkg/ingress/resolver"
+	"k8s.io/ingress-nginx/ingress/resolver"
-	"k8s.io/ingress/core/pkg/ingress/store"
+	"k8s.io/ingress-nginx/ingress/store"
 )
 
 var (

net/ssl/ssl.go

@@ -38,8 +38,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"k8s.io/ingress/core/pkg/file"
+	"k8s.io/ingress-nginx/file"
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
 )
 
 var (

net/ssl/ssl_test.go

@@ -26,7 +26,7 @@ import (
 	certutil "k8s.io/client-go/util/cert"
 	"k8s.io/client-go/util/cert/triple"
 
-	"k8s.io/ingress/core/pkg/ingress"
+	"k8s.io/ingress-nginx/ingress"
 )
 
 // generateRSACerts generates a self signed certificate using a self generated ca