Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update repo to be GCE specific #2

Merged
merged 8 commits into from
Oct 6, 2017
Merged

Update repo to be GCE specific #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
91f3c62
Change imports to ingress-gce
Oct 6, 2017
5db453e
Remove nginx code, docs, and images
Oct 6, 2017
6b00247
Update owners files
Oct 6, 2017
b45c119
Remove root makefile & readme
Oct 6, 2017
cfb2bcf
Condense examples
Oct 6, 2017
3c8e086
Move controllers/gce to root
Oct 6, 2017
e361452
Remove controllers directory
Oct 6, 2017
7540264
Change imports to remove /controllers/gce
Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
0 controllers/gce/BETA_LIMITATIONS.md → BETA_LIMITATIONS.md
View file
Open in desktop
File renamed without changes.
0 controllers/gce/Dockerfile → Dockerfile
View file
Open in desktop
File renamed without changes.
63 changes: 11 additions & 52 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 6 additions & 3 deletions OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
assignees:
- aledbf
- justinsb
- bprashanth
- thockin
- bowei
- nicksardo
- freehan
- mrhohn
- dnardo
- csbell
- nikhiljindal
737 changes: 716 additions & 21 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions controllers/gce/backends/backends.go → backends/backends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions controllers/gce/backends/backends_test.go → backends/backends_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/gce/backends/fakes.go → backends/fakes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 controllers/gce/backends/interfaces.go → backends/interfaces.go
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ...rollers/gce/controller/cluster_manager.go → controller/cluster_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion controllers/gce/controller/controller.go → controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions ...rollers/gce/controller/controller_test.go → controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 controllers/gce/controller/doc.go → controller/doc.go
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions controllers/gce/controller/fakes.go → controller/fakes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion controllers/gce/controller/tls.go → controller/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions controllers/gce/controller/utils.go → controller/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions controllers/gce/controller/utils_test.go → controller/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions controllers/README.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion controllers/gce/.gitignore
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions controllers/gce/Makefile
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions controllers/gce/OWNERS
View file
Open in desktop

This file was deleted.

Loading