Merge pull request #2 from nicksardo/update-repo

Update repo to be GCE specific
kubernetes · Oct 6, 2017 · e72479b · e72479b
2 parents 6b80dda + 7540264
commit e72479b
Show file tree

Hide file tree

Showing 434 changed files with 787 additions and 109,096 deletions.
diff --git a/controllers/gce/BETA_LIMITATIONS.md → BETA_LIMITATIONS.md b/controllers/gce/BETA_LIMITATIONS.md → BETA_LIMITATIONS.md
diff --git a/controllers/gce/Dockerfile → Dockerfile b/controllers/gce/Dockerfile → Dockerfile
diff --git a/Makefile b/Makefile
@@ -1,58 +1,17 @@
-all: fmt lint vet
+all: push
 
-BUILDTAGS=
+# 0.0 shouldn't clobber any released builds
+TAG = 0.9.6
+PREFIX = gcr.io/google_containers/glbc
 
-# base package. It contains the common and backends code
-PKG := "k8s.io/ingress"
+server:
+	CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' -o  glbc *.go
 
-GO_LIST_FILES=$(shell go list ${PKG}/... | grep -v vendor | grep -v -e "test/e2e")
+container: server
+	docker build --pull -t $(PREFIX):$(TAG) .
 
-.PHONY: fmt
-fmt:
-	@go list -f '{{if len .TestGoFiles}}"gofmt -s -l {{.Dir}}"{{end}}' ${GO_LIST_FILES} | xargs -L 1 sh -c
+push: container
+	gcloud docker -- push $(PREFIX):$(TAG)
 
-.PHONY: lint
-lint:
-	@go list -f '{{if len .TestGoFiles}}"golint -min_confidence=0.85 {{.Dir}}/..."{{end}}' ${GO_LIST_FILES} | xargs -L 1 sh -c
-
-.PHONY: test
-test:
-	@go test -v -race -tags "$(BUILDTAGS) cgo" ${GO_LIST_FILES}
-
-.PHONY: test-e2e
-test-e2e: ginkgo
-	@go run hack/e2e.go -v --up --test --down
-
-.PHONY: cover
-cover:
-	@go list -f '{{if len .TestGoFiles}}"go test -coverprofile={{.Dir}}/.coverprofile {{.ImportPath}}"{{end}}' ${GO_LIST_FILES} | xargs -L 1 sh -c
-	gover
-	goveralls -coverprofile=gover.coverprofile -service travis-ci
-
-.PHONY: vet
-vet:
-	@go vet ${GO_LIST_FILES}
-
-.PHONY: clean
 clean:
-	make -C controllers/nginx clean
-
-.PHONY: controllers
-controllers:
-	make -C controllers/nginx build
-
-.PHONY: docker-build
-docker-build:
-	make -C controllers/nginx all-container
-
-.PHONY: docker-push
-docker-push:
-	make -C controllers/nginx all-push
-
-.PHONE: release
-release:
-	make -C controllers/nginx release
-
-.PHONY: ginkgo
-ginkgo:
-	go get github.com/onsi/ginkgo/ginkgo
+	rm -f glbc
diff --git a/OWNERS b/OWNERS
@@ -1,6 +1,9 @@
 assignees:
-- aledbf
-- justinsb
-- bprashanth
 - thockin
+- bowei
 - nicksardo
+- freehan
+- mrhohn
+- dnardo
+- csbell
+- nikhiljindal
diff --git a/README.md b/README.md
diff --git a/controllers/gce/backends/backends.go → backends/backends.go b/controllers/gce/backends/backends.go → backends/backends.go
@@ -32,10 +32,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"k8s.io/ingress/controllers/gce/healthchecks"
-	"k8s.io/ingress/controllers/gce/instances"
-	"k8s.io/ingress/controllers/gce/storage"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/healthchecks"
+	"k8s.io/ingress-gce/instances"
+	"k8s.io/ingress-gce/storage"
+	"k8s.io/ingress-gce/utils"
 )
 
 // BalancingMode represents the loadbalancing configuration of an individual

diff --git a/controllers/gce/backends/backends_test.go → backends/backends_test.go b/controllers/gce/backends/backends_test.go → backends/backends_test.go
@@ -27,10 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"k8s.io/ingress/controllers/gce/healthchecks"
-	"k8s.io/ingress/controllers/gce/instances"
-	"k8s.io/ingress/controllers/gce/storage"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/healthchecks"
+	"k8s.io/ingress-gce/instances"
+	"k8s.io/ingress-gce/storage"
+	"k8s.io/ingress-gce/utils"
 )
 
 const defaultZone = "zone-a"

diff --git a/controllers/gce/backends/fakes.go → backends/fakes.go b/controllers/gce/backends/fakes.go → backends/fakes.go
@@ -23,7 +23,7 @@ import (
 	api_v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/utils"
 )
 
 // NewFakeBackendServices creates a new fake backend services manager.

diff --git a/controllers/gce/backends/interfaces.go → backends/interfaces.go b/controllers/gce/backends/interfaces.go → backends/interfaces.go
diff --git a/...rollers/gce/controller/cluster_manager.go → controller/cluster_manager.go b/...rollers/gce/controller/cluster_manager.go → controller/cluster_manager.go
@@ -24,12 +24,12 @@ import (
 	compute "google.golang.org/api/compute/v1"
 	gce "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 
-	"k8s.io/ingress/controllers/gce/backends"
-	"k8s.io/ingress/controllers/gce/firewalls"
-	"k8s.io/ingress/controllers/gce/healthchecks"
-	"k8s.io/ingress/controllers/gce/instances"
-	"k8s.io/ingress/controllers/gce/loadbalancers"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/backends"
+	"k8s.io/ingress-gce/firewalls"
+	"k8s.io/ingress-gce/healthchecks"
+	"k8s.io/ingress-gce/instances"
+	"k8s.io/ingress-gce/loadbalancers"
+	"k8s.io/ingress-gce/utils"
 )
 
 const (

diff --git a/controllers/gce/controller/controller.go → controller/controller.go b/controllers/gce/controller/controller.go → controller/controller.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 
-	"k8s.io/ingress/controllers/gce/loadbalancers"
+	"k8s.io/ingress-gce/loadbalancers"
 )
 
 var (

diff --git a/...rollers/gce/controller/controller_test.go → controller/controller_test.go b/...rollers/gce/controller/controller_test.go → controller/controller_test.go
@@ -33,9 +33,9 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/kubernetes/pkg/api"
 
-	"k8s.io/ingress/controllers/gce/firewalls"
-	"k8s.io/ingress/controllers/gce/loadbalancers"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/firewalls"
+	"k8s.io/ingress-gce/loadbalancers"
+	"k8s.io/ingress-gce/utils"
 )
 
 const testClusterName = "testcluster"

diff --git a/controllers/gce/controller/doc.go → controller/doc.go b/controllers/gce/controller/doc.go → controller/doc.go
diff --git a/controllers/gce/controller/fakes.go → controller/fakes.go b/controllers/gce/controller/fakes.go → controller/fakes.go
@@ -21,12 +21,12 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"k8s.io/ingress/controllers/gce/backends"
-	"k8s.io/ingress/controllers/gce/firewalls"
-	"k8s.io/ingress/controllers/gce/healthchecks"
-	"k8s.io/ingress/controllers/gce/instances"
-	"k8s.io/ingress/controllers/gce/loadbalancers"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/backends"
+	"k8s.io/ingress-gce/firewalls"
+	"k8s.io/ingress-gce/healthchecks"
+	"k8s.io/ingress-gce/instances"
+	"k8s.io/ingress-gce/loadbalancers"
+	"k8s.io/ingress-gce/utils"
 )
 
 var (

diff --git a/controllers/gce/controller/tls.go → controller/tls.go b/controllers/gce/controller/tls.go → controller/tls.go
@@ -26,7 +26,7 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	"k8s.io/ingress/controllers/gce/loadbalancers"
+	"k8s.io/ingress-gce/loadbalancers"
 )
 
 // secretLoaders returns a type containing all the secrets of an Ingress.

diff --git a/controllers/gce/controller/utils.go → controller/utils.go b/controllers/gce/controller/utils.go → controller/utils.go
@@ -40,9 +40,9 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	"k8s.io/ingress/controllers/gce/backends"
-	"k8s.io/ingress/controllers/gce/loadbalancers"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/backends"
+	"k8s.io/ingress-gce/loadbalancers"
+	"k8s.io/ingress-gce/utils"
 )
 
 const (

diff --git a/controllers/gce/controller/utils_test.go → controller/utils_test.go b/controllers/gce/controller/utils_test.go → controller/utils_test.go
@@ -27,8 +27,8 @@ import (
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/ingress/controllers/gce/backends"
-	"k8s.io/ingress/controllers/gce/utils"
+	"k8s.io/ingress-gce/backends"
+	"k8s.io/ingress-gce/utils"
 )
 
 // Pods created in loops start from this time, for routines that

diff --git a/controllers/README.md b/controllers/README.md
diff --git a/controllers/gce/.gitignore b/controllers/gce/.gitignore
diff --git a/controllers/gce/Makefile b/controllers/gce/Makefile
diff --git a/controllers/gce/OWNERS b/controllers/gce/OWNERS