diff --git a/Makefile b/Makefile index d467e0c20..fc29c8885 100644 --- a/Makefile +++ b/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}" \ - -o ${TEMP_DIR}/rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller + -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}/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 diff --git a/pkg/cmd/controller/main.go b/cmd/nginx/main.go similarity index 100% rename from pkg/cmd/controller/main.go rename to cmd/nginx/main.go diff --git a/pkg/cmd/controller/metrics.go b/cmd/nginx/metrics.go similarity index 97% rename from pkg/cmd/controller/metrics.go rename to cmd/nginx/metrics.go index ee33c6c5e..3b382ef35 100644 --- a/pkg/cmd/controller/metrics.go +++ b/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 ( diff --git a/pkg/cmd/controller/nginx.go b/cmd/nginx/nginx.go similarity index 98% rename from pkg/cmd/controller/nginx.go rename to cmd/nginx/nginx.go index f9e034800..b88408c53 100644 --- a/pkg/cmd/controller/nginx.go +++ b/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" - ngx_template "k8s.io/ingress/controllers/nginx/pkg/template" - "k8s.io/ingress/controllers/nginx/pkg/version" - "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/controller" - "k8s.io/ingress/core/pkg/ingress/defaults" - "k8s.io/ingress/core/pkg/net/dns" - "k8s.io/ingress/core/pkg/net/ssl" + "k8s.io/ingress-nginx/config" + ngx_template "k8s.io/ingress-nginx/template" + "k8s.io/ingress-nginx/version" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/controller" + "k8s.io/ingress-nginx/ingress/defaults" + "k8s.io/ingress-nginx/net/dns" + "k8s.io/ingress-nginx/net/ssl" ) type statusModule string diff --git a/pkg/cmd/controller/nginx_test.go b/cmd/nginx/nginx_test.go similarity index 100% rename from pkg/cmd/controller/nginx_test.go rename to cmd/nginx/nginx_test.go diff --git a/pkg/cmd/controller/tcp.go b/cmd/nginx/tcp.go similarity index 100% rename from pkg/cmd/controller/tcp.go rename to cmd/nginx/tcp.go diff --git a/pkg/cmd/controller/utils.go b/cmd/nginx/utils.go similarity index 100% rename from pkg/cmd/controller/utils.go rename to cmd/nginx/utils.go diff --git a/pkg/cmd/controller/utils_test.go b/cmd/nginx/utils_test.go similarity index 100% rename from pkg/cmd/controller/utils_test.go rename to cmd/nginx/utils_test.go diff --git a/pkg/config/config.go b/config/config.go similarity index 99% rename from pkg/config/config.go rename to config/config.go index 50f88f58f..7012f9d3d 100644 --- a/pkg/config/config.go +++ b/config/config.go @@ -25,8 +25,8 @@ import ( apiv1 "k8s.io/api/core/v1" - "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/defaults" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/defaults" ) const ( diff --git a/pkg/config/config_test.go b/config/config_test.go similarity index 100% rename from pkg/config/config_test.go rename to config/config_test.go diff --git a/examples/custom-controller/Dockerfile b/examples/custom-controller/Dockerfile deleted file mode 100644 index d28b94dbf..000000000 --- a/examples/custom-controller/Dockerfile +++ /dev/null @@ -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 -RUN apt-get update && apt-get install ssl-cert -y -COPY server / -ENTRYPOINT ["/server"] diff --git a/examples/custom-controller/Makefile b/examples/custom-controller/Makefile deleted file mode 100644 index 5e613a31b..000000000 --- a/examples/custom-controller/Makefile +++ /dev/null @@ -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 - diff --git a/examples/custom-controller/README.md b/examples/custom-controller/README.md deleted file mode 100644 index 64c439cea..000000000 --- a/examples/custom-controller/README.md +++ /dev/null @@ -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 -``` - - diff --git a/examples/custom-controller/deployment.yaml b/examples/custom-controller/deployment.yaml deleted file mode 100644 index cf924b7f7..000000000 --- a/examples/custom-controller/deployment.yaml +++ /dev/null @@ -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 diff --git a/examples/custom-controller/server.go b/examples/custom-controller/server.go index 4a2c0ab40..e1af18434 100644 --- a/examples/custom-controller/server.go +++ b/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" - "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/controller" - "k8s.io/ingress/core/pkg/ingress/defaults" + nginxconfig "k8s.io/ingress-nginx/config" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/controller" + "k8s.io/ingress-nginx/ingress/defaults" ) func main() { diff --git a/core/pkg/file/file.go b/file/file.go similarity index 100% rename from core/pkg/file/file.go rename to file/file.go diff --git a/core/pkg/ingress/annotations/alias/main.go b/ingress/annotations/alias/main.go similarity index 95% rename from core/pkg/ingress/annotations/alias/main.go rename to ingress/annotations/alias/main.go index 3f22f41e8..3c71c550c 100644 --- a/core/pkg/ingress/annotations/alias/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/alias/main_test.go b/ingress/annotations/alias/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/alias/main_test.go rename to ingress/annotations/alias/main_test.go diff --git a/core/pkg/ingress/annotations/auth/main.go b/ingress/annotations/auth/main.go similarity index 95% rename from core/pkg/ingress/annotations/auth/main.go rename to ingress/annotations/auth/main.go index 34e056c52..57406405d 100644 --- a/core/pkg/ingress/annotations/auth/main.go +++ b/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/core/pkg/ingress/annotations/parser" - ing_errors "k8s.io/ingress/core/pkg/ingress/errors" - "k8s.io/ingress/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/file" + "k8s.io/ingress-nginx/ingress/annotations/parser" + ing_errors "k8s.io/ingress-nginx/ingress/errors" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/auth/main_test.go b/ingress/annotations/auth/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/auth/main_test.go rename to ingress/annotations/auth/main_test.go diff --git a/core/pkg/ingress/annotations/authreq/main.go b/ingress/annotations/authreq/main.go similarity index 97% rename from core/pkg/ingress/annotations/authreq/main.go rename to ingress/annotations/authreq/main.go index 4c46dd4d5..61d7b6e63 100644 --- a/core/pkg/ingress/annotations/authreq/main.go +++ b/ingress/annotations/authreq/main.go @@ -23,8 +23,8 @@ import ( extensions "k8s.io/api/extensions/v1beta1" - "k8s.io/ingress/core/pkg/ingress/annotations/parser" - ing_errors "k8s.io/ingress/core/pkg/ingress/errors" + "k8s.io/ingress-nginx/ingress/annotations/parser" + ing_errors "k8s.io/ingress-nginx/ingress/errors" ) const ( diff --git a/core/pkg/ingress/annotations/authreq/main_test.go b/ingress/annotations/authreq/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/authreq/main_test.go rename to ingress/annotations/authreq/main_test.go diff --git a/core/pkg/ingress/annotations/authtls/main.go b/ingress/annotations/authtls/main.go similarity index 95% rename from core/pkg/ingress/annotations/authtls/main.go rename to ingress/annotations/authtls/main.go index dd8885eb5..a11a2ff9f 100644 --- a/core/pkg/ingress/annotations/authtls/main.go +++ b/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" - ing_errors "k8s.io/ingress/core/pkg/ingress/errors" - "k8s.io/ingress/core/pkg/ingress/resolver" - "k8s.io/ingress/core/pkg/k8s" + "k8s.io/ingress-nginx/ingress/annotations/parser" + ing_errors "k8s.io/ingress-nginx/ingress/errors" + "k8s.io/ingress-nginx/ingress/resolver" + "k8s.io/ingress-nginx/k8s" "regexp" ) diff --git a/core/pkg/ingress/annotations/authtls/main_test.go b/ingress/annotations/authtls/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/authtls/main_test.go rename to ingress/annotations/authtls/main_test.go diff --git a/core/pkg/ingress/annotations/class/main.go b/ingress/annotations/class/main.go similarity index 94% rename from core/pkg/ingress/annotations/class/main.go rename to ingress/annotations/class/main.go index 2ff73914c..7e0a0f186 100644 --- a/core/pkg/ingress/annotations/class/main.go +++ b/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/core/pkg/ingress/errors" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/errors" ) const ( diff --git a/core/pkg/ingress/annotations/class/main_test.go b/ingress/annotations/class/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/class/main_test.go rename to ingress/annotations/class/main_test.go diff --git a/core/pkg/ingress/annotations/clientbodybuffersize/main.go b/ingress/annotations/clientbodybuffersize/main.go similarity index 95% rename from core/pkg/ingress/annotations/clientbodybuffersize/main.go rename to ingress/annotations/clientbodybuffersize/main.go index bf67f819f..f12a0b0f3 100644 --- a/core/pkg/ingress/annotations/clientbodybuffersize/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/clientbodybuffersize/main_test.go b/ingress/annotations/clientbodybuffersize/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/clientbodybuffersize/main_test.go rename to ingress/annotations/clientbodybuffersize/main_test.go diff --git a/core/pkg/ingress/annotations/cors/main.go b/ingress/annotations/cors/main.go similarity index 95% rename from core/pkg/ingress/annotations/cors/main.go rename to ingress/annotations/cors/main.go index 37aca7986..812fb487b 100644 --- a/core/pkg/ingress/annotations/cors/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/cors/main_test.go b/ingress/annotations/cors/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/cors/main_test.go rename to ingress/annotations/cors/main_test.go diff --git a/core/pkg/ingress/annotations/defaultbackend/main.go b/ingress/annotations/defaultbackend/main.go similarity index 93% rename from core/pkg/ingress/annotations/defaultbackend/main.go rename to ingress/annotations/defaultbackend/main.go index f9bb440c2..7c73fce35 100644 --- a/core/pkg/ingress/annotations/defaultbackend/main.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/healthcheck/main.go b/ingress/annotations/healthcheck/main.go similarity index 94% rename from core/pkg/ingress/annotations/healthcheck/main.go rename to ingress/annotations/healthcheck/main.go index 7b63f068d..eece7adbd 100644 --- a/core/pkg/ingress/annotations/healthcheck/main.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/healthcheck/main_test.go b/ingress/annotations/healthcheck/main_test.go similarity index 98% rename from core/pkg/ingress/annotations/healthcheck/main_test.go rename to ingress/annotations/healthcheck/main_test.go index 14786bacc..80ebb7436 100644 --- a/core/pkg/ingress/annotations/healthcheck/main_test.go +++ b/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 { diff --git a/core/pkg/ingress/annotations/ipwhitelist/main.go b/ingress/annotations/ipwhitelist/main.go similarity index 93% rename from core/pkg/ingress/annotations/ipwhitelist/main.go rename to ingress/annotations/ipwhitelist/main.go index e775abe3a..742755ce5 100644 --- a/core/pkg/ingress/annotations/ipwhitelist/main.go +++ b/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" - ing_errors "k8s.io/ingress/core/pkg/ingress/errors" - "k8s.io/ingress/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + ing_errors "k8s.io/ingress-nginx/ingress/errors" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/ipwhitelist/main_test.go b/ingress/annotations/ipwhitelist/main_test.go similarity index 99% rename from core/pkg/ingress/annotations/ipwhitelist/main_test.go rename to ingress/annotations/ipwhitelist/main_test.go index b5ab5ed2f..613c9826e 100644 --- a/core/pkg/ingress/annotations/ipwhitelist/main_test.go +++ b/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 { diff --git a/core/pkg/ingress/annotations/parser/main.go b/ingress/annotations/parser/main.go similarity index 98% rename from core/pkg/ingress/annotations/parser/main.go rename to ingress/annotations/parser/main.go index 929ff657f..7cc203dec 100644 --- a/core/pkg/ingress/annotations/parser/main.go +++ b/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 diff --git a/core/pkg/ingress/annotations/parser/main_test.go b/ingress/annotations/parser/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/parser/main_test.go rename to ingress/annotations/parser/main_test.go diff --git a/core/pkg/ingress/annotations/portinredirect/main.go b/ingress/annotations/portinredirect/main.go similarity index 93% rename from core/pkg/ingress/annotations/portinredirect/main.go rename to ingress/annotations/portinredirect/main.go index 3854f7602..0fe6e53f7 100644 --- a/core/pkg/ingress/annotations/portinredirect/main.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/portinredirect/main_test.go b/ingress/annotations/portinredirect/main_test.go similarity index 98% rename from core/pkg/ingress/annotations/portinredirect/main_test.go rename to ingress/annotations/portinredirect/main_test.go index 4c43e2895..e089250db 100644 --- a/core/pkg/ingress/annotations/portinredirect/main_test.go +++ b/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 { diff --git a/core/pkg/ingress/annotations/proxy/main.go b/ingress/annotations/proxy/main.go similarity index 97% rename from core/pkg/ingress/annotations/proxy/main.go rename to ingress/annotations/proxy/main.go index e31fb4ba7..a64eed7d4 100644 --- a/core/pkg/ingress/annotations/proxy/main.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/proxy/main_test.go b/ingress/annotations/proxy/main_test.go similarity index 99% rename from core/pkg/ingress/annotations/proxy/main_test.go rename to ingress/annotations/proxy/main_test.go index 8700457f1..f6f296cba 100644 --- a/core/pkg/ingress/annotations/proxy/main_test.go +++ b/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 { diff --git a/core/pkg/ingress/annotations/ratelimit/main.go b/ingress/annotations/ratelimit/main.go similarity index 97% rename from core/pkg/ingress/annotations/ratelimit/main.go rename to ingress/annotations/ratelimit/main.go index b2d8979f1..710303696 100644 --- a/core/pkg/ingress/annotations/ratelimit/main.go +++ b/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/core/pkg/ingress/resolver" - "k8s.io/ingress/core/pkg/net" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" + "k8s.io/ingress-nginx/net" ) const ( diff --git a/core/pkg/ingress/annotations/ratelimit/main_test.go b/ingress/annotations/ratelimit/main_test.go similarity index 98% rename from core/pkg/ingress/annotations/ratelimit/main_test.go rename to ingress/annotations/ratelimit/main_test.go index e7d405c03..475a7fc99 100644 --- a/core/pkg/ingress/annotations/ratelimit/main_test.go +++ b/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 { diff --git a/core/pkg/ingress/annotations/redirect/redirect.go b/ingress/annotations/redirect/redirect.go similarity index 96% rename from core/pkg/ingress/annotations/redirect/redirect.go rename to ingress/annotations/redirect/redirect.go index b5e366580..d91bdaa61 100644 --- a/core/pkg/ingress/annotations/redirect/redirect.go +++ b/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/core/pkg/ingress/errors" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/errors" ) const ( diff --git a/core/pkg/ingress/annotations/rewrite/main.go b/ingress/annotations/rewrite/main.go similarity index 97% rename from core/pkg/ingress/annotations/rewrite/main.go rename to ingress/annotations/rewrite/main.go index 32cc421ae..3f5ffc533 100644 --- a/core/pkg/ingress/annotations/rewrite/main.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/rewrite/main_test.go b/ingress/annotations/rewrite/main_test.go similarity index 98% rename from core/pkg/ingress/annotations/rewrite/main_test.go rename to ingress/annotations/rewrite/main_test.go index 6529857f9..a537506da 100644 --- a/core/pkg/ingress/annotations/rewrite/main_test.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/secureupstream/main.go b/ingress/annotations/secureupstream/main.go similarity index 95% rename from core/pkg/ingress/annotations/secureupstream/main.go rename to ingress/annotations/secureupstream/main.go index 33c979819..70641748b 100644 --- a/core/pkg/ingress/annotations/secureupstream/main.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/annotations/secureupstream/main_test.go b/ingress/annotations/secureupstream/main_test.go similarity index 98% rename from core/pkg/ingress/annotations/secureupstream/main_test.go rename to ingress/annotations/secureupstream/main_test.go index 961721b4f..1d65bf7b6 100644 --- a/core/pkg/ingress/annotations/secureupstream/main_test.go +++ b/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 { diff --git a/core/pkg/ingress/annotations/serversnippet/main.go b/ingress/annotations/serversnippet/main.go similarity index 95% rename from core/pkg/ingress/annotations/serversnippet/main.go rename to ingress/annotations/serversnippet/main.go index 0062bfdd5..18c6ffb96 100644 --- a/core/pkg/ingress/annotations/serversnippet/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/serversnippet/main_test.go b/ingress/annotations/serversnippet/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/serversnippet/main_test.go rename to ingress/annotations/serversnippet/main_test.go diff --git a/core/pkg/ingress/annotations/serviceupstream/main.go b/ingress/annotations/serviceupstream/main.go similarity index 95% rename from core/pkg/ingress/annotations/serviceupstream/main.go rename to ingress/annotations/serviceupstream/main.go index a92d4a67c..7ffbd4a5d 100644 --- a/core/pkg/ingress/annotations/serviceupstream/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/serviceupstream/main_test.go b/ingress/annotations/serviceupstream/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/serviceupstream/main_test.go rename to ingress/annotations/serviceupstream/main_test.go diff --git a/core/pkg/ingress/annotations/sessionaffinity/main.go b/ingress/annotations/sessionaffinity/main.go similarity index 98% rename from core/pkg/ingress/annotations/sessionaffinity/main.go rename to ingress/annotations/sessionaffinity/main.go index 032af3b77..36c1c0e23 100644 --- a/core/pkg/ingress/annotations/sessionaffinity/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/sessionaffinity/main_test.go b/ingress/annotations/sessionaffinity/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/sessionaffinity/main_test.go rename to ingress/annotations/sessionaffinity/main_test.go diff --git a/core/pkg/ingress/annotations/snippet/main.go b/ingress/annotations/snippet/main.go similarity index 95% rename from core/pkg/ingress/annotations/snippet/main.go rename to ingress/annotations/snippet/main.go index 3c1e5a212..4de6f270d 100644 --- a/core/pkg/ingress/annotations/snippet/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/snippet/main_test.go b/ingress/annotations/snippet/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/snippet/main_test.go rename to ingress/annotations/snippet/main_test.go diff --git a/core/pkg/ingress/annotations/sslpassthrough/main.go b/ingress/annotations/sslpassthrough/main.go similarity index 91% rename from core/pkg/ingress/annotations/sslpassthrough/main.go rename to ingress/annotations/sslpassthrough/main.go index d08634e02..9bed87239 100644 --- a/core/pkg/ingress/annotations/sslpassthrough/main.go +++ b/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" - ing_errors "k8s.io/ingress/core/pkg/ingress/errors" + "k8s.io/ingress-nginx/ingress/annotations/parser" + ing_errors "k8s.io/ingress-nginx/ingress/errors" ) const ( diff --git a/core/pkg/ingress/annotations/sslpassthrough/main_test.go b/ingress/annotations/sslpassthrough/main_test.go similarity index 100% rename from core/pkg/ingress/annotations/sslpassthrough/main_test.go rename to ingress/annotations/sslpassthrough/main_test.go diff --git a/core/pkg/ingress/annotations/upstreamvhost/main.go b/ingress/annotations/upstreamvhost/main.go similarity index 95% rename from core/pkg/ingress/annotations/upstreamvhost/main.go rename to ingress/annotations/upstreamvhost/main.go index 1603905d0..4bf2d2c1a 100644 --- a/core/pkg/ingress/annotations/upstreamvhost/main.go +++ b/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 ( diff --git a/core/pkg/ingress/annotations/vtsfilterkey/main.go b/ingress/annotations/vtsfilterkey/main.go similarity index 95% rename from core/pkg/ingress/annotations/vtsfilterkey/main.go rename to ingress/annotations/vtsfilterkey/main.go index 401e9b7e8..67c1328d2 100644 --- a/core/pkg/ingress/annotations/vtsfilterkey/main.go +++ b/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 ( diff --git a/core/pkg/ingress/controller/annotations.go b/ingress/controller/annotations.go similarity index 78% rename from core/pkg/ingress/controller/annotations.go rename to ingress/controller/annotations.go index 40f623bcf..3e2404652 100644 --- a/core/pkg/ingress/controller/annotations.go +++ b/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/core/pkg/ingress/annotations/auth" - "k8s.io/ingress/core/pkg/ingress/annotations/authreq" - "k8s.io/ingress/core/pkg/ingress/annotations/authtls" - "k8s.io/ingress/core/pkg/ingress/annotations/clientbodybuffersize" - "k8s.io/ingress/core/pkg/ingress/annotations/cors" - "k8s.io/ingress/core/pkg/ingress/annotations/defaultbackend" - "k8s.io/ingress/core/pkg/ingress/annotations/healthcheck" - "k8s.io/ingress/core/pkg/ingress/annotations/ipwhitelist" - "k8s.io/ingress/core/pkg/ingress/annotations/parser" - "k8s.io/ingress/core/pkg/ingress/annotations/portinredirect" - "k8s.io/ingress/core/pkg/ingress/annotations/proxy" - "k8s.io/ingress/core/pkg/ingress/annotations/ratelimit" - "k8s.io/ingress/core/pkg/ingress/annotations/redirect" - "k8s.io/ingress/core/pkg/ingress/annotations/rewrite" - "k8s.io/ingress/core/pkg/ingress/annotations/secureupstream" - "k8s.io/ingress/core/pkg/ingress/annotations/serversnippet" - "k8s.io/ingress/core/pkg/ingress/annotations/serviceupstream" - "k8s.io/ingress/core/pkg/ingress/annotations/sessionaffinity" - "k8s.io/ingress/core/pkg/ingress/annotations/snippet" - "k8s.io/ingress/core/pkg/ingress/annotations/sslpassthrough" - "k8s.io/ingress/core/pkg/ingress/annotations/upstreamvhost" - "k8s.io/ingress/core/pkg/ingress/annotations/vtsfilterkey" - "k8s.io/ingress/core/pkg/ingress/errors" - "k8s.io/ingress/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/annotations/alias" + "k8s.io/ingress-nginx/ingress/annotations/auth" + "k8s.io/ingress-nginx/ingress/annotations/authreq" + "k8s.io/ingress-nginx/ingress/annotations/authtls" + "k8s.io/ingress-nginx/ingress/annotations/clientbodybuffersize" + "k8s.io/ingress-nginx/ingress/annotations/cors" + "k8s.io/ingress-nginx/ingress/annotations/defaultbackend" + "k8s.io/ingress-nginx/ingress/annotations/healthcheck" + "k8s.io/ingress-nginx/ingress/annotations/ipwhitelist" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/annotations/portinredirect" + "k8s.io/ingress-nginx/ingress/annotations/proxy" + "k8s.io/ingress-nginx/ingress/annotations/ratelimit" + "k8s.io/ingress-nginx/ingress/annotations/redirect" + "k8s.io/ingress-nginx/ingress/annotations/rewrite" + "k8s.io/ingress-nginx/ingress/annotations/secureupstream" + "k8s.io/ingress-nginx/ingress/annotations/serversnippet" + "k8s.io/ingress-nginx/ingress/annotations/serviceupstream" + "k8s.io/ingress-nginx/ingress/annotations/sessionaffinity" + "k8s.io/ingress-nginx/ingress/annotations/snippet" + "k8s.io/ingress-nginx/ingress/annotations/sslpassthrough" + "k8s.io/ingress-nginx/ingress/annotations/upstreamvhost" + "k8s.io/ingress-nginx/ingress/annotations/vtsfilterkey" + "k8s.io/ingress-nginx/ingress/errors" + "k8s.io/ingress-nginx/ingress/resolver" ) type extractorConfig interface { diff --git a/core/pkg/ingress/controller/annotations_test.go b/ingress/controller/annotations_test.go similarity index 98% rename from core/pkg/ingress/controller/annotations_test.go rename to ingress/controller/annotations_test.go index 47106d8e7..867f3a5b4 100644 --- a/core/pkg/ingress/controller/annotations_test.go +++ b/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/core/pkg/ingress/resolver" + "k8s.io/ingress-nginx/ingress/defaults" + "k8s.io/ingress-nginx/ingress/resolver" ) const ( diff --git a/core/pkg/ingress/controller/backend_ssl.go b/ingress/controller/backend_ssl.go similarity index 96% rename from core/pkg/ingress/controller/backend_ssl.go rename to ingress/controller/backend_ssl.go index 6fbaf303b..6bf79d322 100644 --- a/core/pkg/ingress/controller/backend_ssl.go +++ b/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/core/pkg/ingress/annotations/class" - "k8s.io/ingress/core/pkg/ingress/annotations/parser" - "k8s.io/ingress/core/pkg/net/ssl" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/annotations/class" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/net/ssl" ) // syncSecret keeps in sync Secrets used by Ingress rules with the files on diff --git a/core/pkg/ingress/controller/backend_ssl_test.go b/ingress/controller/backend_ssl_test.go similarity index 98% rename from core/pkg/ingress/controller/backend_ssl_test.go rename to ingress/controller/backend_ssl_test.go index a6416b61b..b1284b11d 100644 --- a/core/pkg/ingress/controller/backend_ssl_test.go +++ b/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/core/pkg/ingress/store" - "k8s.io/ingress/core/pkg/task" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/store" + "k8s.io/ingress-nginx/task" "k8s.io/kubernetes/pkg/api" ) diff --git a/core/pkg/ingress/controller/controller.go b/ingress/controller/controller.go similarity index 98% rename from core/pkg/ingress/controller/controller.go rename to ingress/controller/controller.go index 84d9155be..28bf822ba 100644 --- a/core/pkg/ingress/controller/controller.go +++ b/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/core/pkg/ingress/annotations/class" - "k8s.io/ingress/core/pkg/ingress/annotations/healthcheck" - "k8s.io/ingress/core/pkg/ingress/annotations/parser" - "k8s.io/ingress/core/pkg/ingress/annotations/proxy" - "k8s.io/ingress/core/pkg/ingress/defaults" - "k8s.io/ingress/core/pkg/ingress/resolver" - "k8s.io/ingress/core/pkg/ingress/status" - "k8s.io/ingress/core/pkg/k8s" - "k8s.io/ingress/core/pkg/net/ssl" - local_strings "k8s.io/ingress/core/pkg/strings" - "k8s.io/ingress/core/pkg/task" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/annotations/class" + "k8s.io/ingress-nginx/ingress/annotations/healthcheck" + "k8s.io/ingress-nginx/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress/annotations/proxy" + "k8s.io/ingress-nginx/ingress/defaults" + "k8s.io/ingress-nginx/ingress/resolver" + "k8s.io/ingress-nginx/ingress/status" + "k8s.io/ingress-nginx/k8s" + "k8s.io/ingress-nginx/net/ssl" + local_strings "k8s.io/ingress-nginx/strings" + "k8s.io/ingress-nginx/task" ) const ( diff --git a/core/pkg/ingress/controller/launch.go b/ingress/controller/launch.go similarity index 99% rename from core/pkg/ingress/controller/launch.go rename to ingress/controller/launch.go index b1155c730..2664a22ce 100644 --- a/core/pkg/ingress/controller/launch.go +++ b/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/core/pkg/k8s" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/k8s" ) // NewIngressController returns a configured Ingress controller diff --git a/core/pkg/ingress/controller/listers.go b/ingress/controller/listers.go similarity index 98% rename from core/pkg/ingress/controller/listers.go rename to ingress/controller/listers.go index 6765f3478..8dfe845f3 100644 --- a/core/pkg/ingress/controller/listers.go +++ b/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/core/pkg/ingress/annotations/class" - "k8s.io/ingress/core/pkg/ingress/annotations/parser" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/annotations/class" + "k8s.io/ingress-nginx/ingress/annotations/parser" ) type cacheController struct { diff --git a/core/pkg/ingress/controller/metrics.go b/ingress/controller/metrics.go similarity index 98% rename from core/pkg/ingress/controller/metrics.go rename to ingress/controller/metrics.go index e02773c6c..0dba4d960 100644 --- a/core/pkg/ingress/controller/metrics.go +++ b/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 ( diff --git a/core/pkg/ingress/controller/util.go b/ingress/controller/util.go similarity index 97% rename from core/pkg/ingress/controller/util.go rename to ingress/controller/util.go index 30d93c8b3..5e2d80a89 100644 --- a/core/pkg/ingress/controller/util.go +++ b/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 diff --git a/core/pkg/ingress/controller/util_test.go b/ingress/controller/util_test.go similarity index 83% rename from core/pkg/ingress/controller/util_test.go rename to ingress/controller/util_test.go index 3847cb2ba..c947f0cf0 100644 --- a/core/pkg/ingress/controller/util_test.go +++ b/ingress/controller/util_test.go @@ -20,14 +20,14 @@ import ( "reflect" "testing" - "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/annotations/auth" - "k8s.io/ingress/core/pkg/ingress/annotations/authreq" - "k8s.io/ingress/core/pkg/ingress/annotations/ipwhitelist" - "k8s.io/ingress/core/pkg/ingress/annotations/proxy" - "k8s.io/ingress/core/pkg/ingress/annotations/ratelimit" - "k8s.io/ingress/core/pkg/ingress/annotations/redirect" - "k8s.io/ingress/core/pkg/ingress/annotations/rewrite" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/annotations/auth" + "k8s.io/ingress-nginx/ingress/annotations/authreq" + "k8s.io/ingress-nginx/ingress/annotations/ipwhitelist" + "k8s.io/ingress-nginx/ingress/annotations/proxy" + "k8s.io/ingress-nginx/ingress/annotations/ratelimit" + "k8s.io/ingress-nginx/ingress/annotations/redirect" + "k8s.io/ingress-nginx/ingress/annotations/rewrite" ) type fakeError struct{} diff --git a/core/pkg/ingress/defaults/main.go b/ingress/defaults/main.go similarity index 100% rename from core/pkg/ingress/defaults/main.go rename to ingress/defaults/main.go diff --git a/core/pkg/ingress/doc.go b/ingress/doc.go similarity index 100% rename from core/pkg/ingress/doc.go rename to ingress/doc.go diff --git a/core/pkg/ingress/errors/errors.go b/ingress/errors/errors.go similarity index 100% rename from core/pkg/ingress/errors/errors.go rename to ingress/errors/errors.go diff --git a/core/pkg/ingress/errors/errors_test.go b/ingress/errors/errors_test.go similarity index 100% rename from core/pkg/ingress/errors/errors_test.go rename to ingress/errors/errors_test.go diff --git a/core/pkg/ingress/resolver/main.go b/ingress/resolver/main.go similarity index 98% rename from core/pkg/ingress/resolver/main.go rename to ingress/resolver/main.go index d4672aa76..2b06b89fa 100644 --- a/core/pkg/ingress/resolver/main.go +++ b/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 diff --git a/core/pkg/ingress/sort_ingress.go b/ingress/sort_ingress.go similarity index 100% rename from core/pkg/ingress/sort_ingress.go rename to ingress/sort_ingress.go diff --git a/core/pkg/ingress/sort_ingress_test.go b/ingress/sort_ingress_test.go similarity index 100% rename from core/pkg/ingress/sort_ingress_test.go rename to ingress/sort_ingress_test.go diff --git a/core/pkg/ingress/status/status.go b/ingress/status/status.go similarity index 98% rename from core/pkg/ingress/status/status.go rename to ingress/status/status.go index 56cf2774a..b17449f90 100644 --- a/core/pkg/ingress/status/status.go +++ b/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/core/pkg/ingress/store" - "k8s.io/ingress/core/pkg/k8s" - ingress_strings "k8s.io/ingress/core/pkg/strings" - "k8s.io/ingress/core/pkg/task" + "k8s.io/ingress-nginx/ingress/annotations/class" + "k8s.io/ingress-nginx/ingress/store" + "k8s.io/ingress-nginx/k8s" + ingress_strings "k8s.io/ingress-nginx/strings" + "k8s.io/ingress-nginx/task" ) const ( diff --git a/core/pkg/ingress/status/status_test.go b/ingress/status/status_test.go similarity index 98% rename from core/pkg/ingress/status/status_test.go rename to ingress/status/status_test.go index 103b5e473..6b0199e52 100644 --- a/core/pkg/ingress/status/status_test.go +++ b/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/core/pkg/ingress/store" - "k8s.io/ingress/core/pkg/k8s" - "k8s.io/ingress/core/pkg/task" + "k8s.io/ingress-nginx/ingress/annotations/class" + "k8s.io/ingress-nginx/ingress/store" + "k8s.io/ingress-nginx/k8s" + "k8s.io/ingress-nginx/task" ) func buildLoadBalancerIngressByIP() []apiv1.LoadBalancerIngress { diff --git a/core/pkg/ingress/store/main.go b/ingress/store/main.go similarity index 100% rename from core/pkg/ingress/store/main.go rename to ingress/store/main.go diff --git a/core/pkg/ingress/type_equals_test.go b/ingress/type_equals_test.go similarity index 100% rename from core/pkg/ingress/type_equals_test.go rename to ingress/type_equals_test.go diff --git a/core/pkg/ingress/types.go b/ingress/types.go similarity index 96% rename from core/pkg/ingress/types.go rename to ingress/types.go index 52ba386f5..c1d95f15f 100644 --- a/core/pkg/ingress/types.go +++ b/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/core/pkg/ingress/annotations/authreq" - "k8s.io/ingress/core/pkg/ingress/annotations/authtls" - "k8s.io/ingress/core/pkg/ingress/annotations/ipwhitelist" - "k8s.io/ingress/core/pkg/ingress/annotations/proxy" - "k8s.io/ingress/core/pkg/ingress/annotations/ratelimit" - "k8s.io/ingress/core/pkg/ingress/annotations/redirect" - "k8s.io/ingress/core/pkg/ingress/annotations/rewrite" - "k8s.io/ingress/core/pkg/ingress/defaults" - "k8s.io/ingress/core/pkg/ingress/resolver" - "k8s.io/ingress/core/pkg/ingress/store" + "k8s.io/ingress-nginx/ingress/annotations/auth" + "k8s.io/ingress-nginx/ingress/annotations/authreq" + "k8s.io/ingress-nginx/ingress/annotations/authtls" + "k8s.io/ingress-nginx/ingress/annotations/ipwhitelist" + "k8s.io/ingress-nginx/ingress/annotations/proxy" + "k8s.io/ingress-nginx/ingress/annotations/ratelimit" + "k8s.io/ingress-nginx/ingress/annotations/redirect" + "k8s.io/ingress-nginx/ingress/annotations/rewrite" + "k8s.io/ingress-nginx/ingress/defaults" + "k8s.io/ingress-nginx/ingress/resolver" + "k8s.io/ingress-nginx/ingress/store" ) var ( diff --git a/core/pkg/ingress/types_equals.go b/ingress/types_equals.go similarity index 100% rename from core/pkg/ingress/types_equals.go rename to ingress/types_equals.go diff --git a/core/pkg/ingress/zz_generated.types.go b/ingress/zz_generated.types.go similarity index 100% rename from core/pkg/ingress/zz_generated.types.go rename to ingress/zz_generated.types.go diff --git a/core/pkg/k8s/main.go b/k8s/main.go similarity index 100% rename from core/pkg/k8s/main.go rename to k8s/main.go diff --git a/core/pkg/k8s/main_test.go b/k8s/main_test.go similarity index 100% rename from core/pkg/k8s/main_test.go rename to k8s/main_test.go diff --git a/pkg/metric/collector/nginx.go b/metric/collector/nginx.go similarity index 100% rename from pkg/metric/collector/nginx.go rename to metric/collector/nginx.go diff --git a/pkg/metric/collector/process.go b/metric/collector/process.go similarity index 100% rename from pkg/metric/collector/process.go rename to metric/collector/process.go diff --git a/pkg/metric/collector/scrape.go b/metric/collector/scrape.go similarity index 100% rename from pkg/metric/collector/scrape.go rename to metric/collector/scrape.go diff --git a/pkg/metric/collector/status.go b/metric/collector/status.go similarity index 100% rename from pkg/metric/collector/status.go rename to metric/collector/status.go diff --git a/pkg/metric/collector/status_test.go b/metric/collector/status_test.go similarity index 100% rename from pkg/metric/collector/status_test.go rename to metric/collector/status_test.go diff --git a/pkg/metric/collector/vts.go b/metric/collector/vts.go similarity index 100% rename from pkg/metric/collector/vts.go rename to metric/collector/vts.go diff --git a/core/pkg/net/dns/dns.go b/net/dns/dns.go similarity index 100% rename from core/pkg/net/dns/dns.go rename to net/dns/dns.go diff --git a/core/pkg/net/dns/dns_test.go b/net/dns/dns_test.go similarity index 100% rename from core/pkg/net/dns/dns_test.go rename to net/dns/dns_test.go diff --git a/core/pkg/net/ipnet.go b/net/ipnet.go similarity index 100% rename from core/pkg/net/ipnet.go rename to net/ipnet.go diff --git a/core/pkg/net/ipnet_test.go b/net/ipnet_test.go similarity index 100% rename from core/pkg/net/ipnet_test.go rename to net/ipnet_test.go diff --git a/core/pkg/net/net.go b/net/net.go similarity index 100% rename from core/pkg/net/net.go rename to net/net.go diff --git a/core/pkg/net/net_test.go b/net/net_test.go similarity index 100% rename from core/pkg/net/net_test.go rename to net/net_test.go diff --git a/core/pkg/net/ssl/ssl.go b/net/ssl/ssl.go similarity index 99% rename from core/pkg/net/ssl/ssl.go rename to net/ssl/ssl.go index 799cb835c..56d6ddcd5 100644 --- a/core/pkg/net/ssl/ssl.go +++ b/net/ssl/ssl.go @@ -38,8 +38,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/ingress/core/pkg/file" - "k8s.io/ingress/core/pkg/ingress" + "k8s.io/ingress-nginx/file" + "k8s.io/ingress-nginx/ingress" ) var ( diff --git a/core/pkg/net/ssl/ssl_test.go b/net/ssl/ssl_test.go similarity index 99% rename from core/pkg/net/ssl/ssl_test.go rename to net/ssl/ssl_test.go index d682a17a7..ee4feb9ef 100644 --- a/core/pkg/net/ssl/ssl_test.go +++ b/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 diff --git a/core/pkg/strings/string.go b/strings/string.go similarity index 100% rename from core/pkg/strings/string.go rename to strings/string.go diff --git a/core/pkg/strings/string_test.go b/strings/string_test.go similarity index 100% rename from core/pkg/strings/string_test.go rename to strings/string_test.go diff --git a/core/pkg/task/queue.go b/task/queue.go similarity index 100% rename from core/pkg/task/queue.go rename to task/queue.go diff --git a/core/pkg/task/queue_test.go b/task/queue_test.go similarity index 100% rename from core/pkg/task/queue_test.go rename to task/queue_test.go diff --git a/pkg/template/configmap.go b/template/configmap.go similarity index 97% rename from pkg/template/configmap.go rename to template/configmap.go index f07ef46b6..4a77ef2db 100644 --- a/pkg/template/configmap.go +++ b/template/configmap.go @@ -26,8 +26,8 @@ import ( "github.com/mitchellh/mapstructure" - "k8s.io/ingress/controllers/nginx/pkg/config" - ing_net "k8s.io/ingress/core/pkg/net" + "k8s.io/ingress-nginx/config" + ing_net "k8s.io/ingress-nginx/net" ) const ( diff --git a/pkg/template/configmap_test.go b/template/configmap_test.go similarity index 98% rename from pkg/template/configmap_test.go rename to template/configmap_test.go index 59bddbc56..8ff285a6c 100644 --- a/pkg/template/configmap_test.go +++ b/template/configmap_test.go @@ -21,7 +21,7 @@ import ( "github.com/kylelemons/godebug/pretty" - "k8s.io/ingress/controllers/nginx/pkg/config" + "k8s.io/ingress-nginx/config" ) func TestFilterErrors(t *testing.T) { diff --git a/pkg/template/template.go b/template/template.go similarity index 98% rename from pkg/template/template.go rename to template/template.go index cde9a2ac5..d148c6d1c 100644 --- a/pkg/template/template.go +++ b/template/template.go @@ -35,11 +35,11 @@ import ( extensions "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/ingress/controllers/nginx/pkg/config" - "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/annotations/ratelimit" - ing_net "k8s.io/ingress/core/pkg/net" - "k8s.io/ingress/core/pkg/watch" + "k8s.io/ingress-nginx/config" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/annotations/ratelimit" + ing_net "k8s.io/ingress-nginx/net" + "k8s.io/ingress-nginx/watch" ) const ( diff --git a/pkg/template/template_test.go b/template/template_test.go similarity index 98% rename from pkg/template/template_test.go rename to template/template_test.go index 1360eba4a..402177580 100644 --- a/pkg/template/template_test.go +++ b/template/template_test.go @@ -26,10 +26,10 @@ import ( "strings" "testing" - "k8s.io/ingress/controllers/nginx/pkg/config" - "k8s.io/ingress/core/pkg/ingress" - "k8s.io/ingress/core/pkg/ingress/annotations/authreq" - "k8s.io/ingress/core/pkg/ingress/annotations/rewrite" + "k8s.io/ingress-nginx/config" + "k8s.io/ingress-nginx/ingress" + "k8s.io/ingress-nginx/ingress/annotations/authreq" + "k8s.io/ingress-nginx/ingress/annotations/rewrite" ) var ( diff --git a/pkg/version/version.go b/version/version.go similarity index 100% rename from pkg/version/version.go rename to version/version.go diff --git a/core/pkg/watch/file_watcher.go b/watch/file_watcher.go similarity index 100% rename from core/pkg/watch/file_watcher.go rename to watch/file_watcher.go diff --git a/core/pkg/watch/file_watcher_test.go b/watch/file_watcher_test.go similarity index 100% rename from core/pkg/watch/file_watcher_test.go rename to watch/file_watcher_test.go