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

Support multiple feed-ingress controllers per environment #195

Merged
merged 23 commits into from
Aug 28, 2019
Merged

Support multiple feed-ingress controllers per environment #195

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
dc63b19
Support multiple ingresses per enviroment
Nov 22, 2018
89aba21
Format changes as the travis build failed
Jan 31, 2019
3438564
Update readme and changelog
domleb Feb 8, 2019
7477960
Changes for PB review
Feb 13, 2019
d738741
Format code with 'make format'
howardburgess Jul 3, 2019
cdf9c6f
Remove --main-ingress flag
howardburgess Jul 16, 2019
95ecc41
Allow watching only ingresses in certain namespaces
howardburgess Jul 18, 2019
75ea40b
Avoid duplication in GetIngresses/GetAllIngresses
howardburgess Aug 2, 2019
16d037d
Clarify "ingress name" by renaming to "ingress controller name"
howardburgess Aug 2, 2019
808219c
Review updates
howardburgess Aug 6, 2019
81582dd
Pre-filter namespaces to avoid excessive iteration
howardburgess Aug 7, 2019
089d98e
Split into subcomands using Cobra
howardburgess Aug 9, 2019
4404c5c
Add Cobra change to changelog
howardburgess Aug 12, 2019
72a8f5d
Remove file added inadvertently
howardburgess Aug 12, 2019
2555a0e
Remove deprecated features
howardburgess Aug 12, 2019
30ba478
README typo
howardburgess Aug 12, 2019
027a3f1
Review comment
howardburgess Aug 13, 2019
63491c6
Add flag --include-unnamed-ingresses which
howardburgess Aug 19, 2019
d3a111e
Update README for new --include-unnamed-ingresses flag
howardburgess Aug 20, 2019
fdb06aa
Use the standard kubernetes.io/ingress.class annotation
howardburgess Aug 21, 2019
1aae0ff
Use "ingress class" everywhere instead of "controller name"
howardburgess Aug 23, 2019
7ae4658
Review comment - missing rename
howardburgess Aug 27, 2019
ad6efc2
Simplify imports
howardburgess Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go

go:
- 1.11.1
- 1.11.12

before_install:
- sudo add-apt-repository -y ppa:jonathonf/python-3.6
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v2.0.0
* Added support for multiple feed-ingress controllers per cluster
* Feed-ingress invocation split into subcommands, using double-dashed arguments
* Remove support for deprecated ingress resource annotations:
`sky.uk/frontend-elb-scheme` (replacement `sky.uk/frontend-scheme`),
`sky.uk/backend-keepalive-seconds` (replacement `sky.uk/backend-timeout-seconds`)
* Remove deprecated feed-ingress command-line argument `--nginx-default-backend-keepalive-seconds` (replacement `--nginx-default-backend-timeout-seconds`)

This is a breaking change. Follow the instructions to [upgrade from v1 to v2](https://github.com/sky-uk/feed#upgrade-from-v1-to-v2)

# v1.14.2
* Skip ingress when http and/or path are not defined

Expand Down
24 changes: 22 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@
[[constraint]]
branch = "master"
name = "github.com/onrik/logrus"

[[constraint]]
name = "github.com/spf13/pflag"
version = "1.0.3"
18 changes: 14 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
ifdef VERSION
version := $(VERSION)
else
git_rev := $(shell git rev-parse --short HEAD)
git_tag := $(shell git tag --points-at=$(git_rev))
version := $(if $(git_tag),$(git_tag),dev-$(git_rev))
endif

pkgs := $(shell go list ./... | grep -v /vendor/)
files := $(shell find . -path ./vendor -prune -o -name '*.go' -print)
build_time := $(shell date -u)
ldflags := -X "github.com/sky-uk/feed/feed-ingress/cmd.version=$(version)" -X "github.com/sky-uk/feed/feed-ingress/cmd.buildTime=$(build_time)"

.PHONY: all format test build vet lint copy docker release checkformat check clean

Expand All @@ -9,9 +19,9 @@ travis : checkformat check docker

setup:
@echo "== setup"
go get github.com/golang/lint/golint
go get golang.org/x/tools/cmd/goimports
go get github.com/golang/dep/cmd/dep
go get -u golang.org/x/lint/golint
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's moved

go get -u golang.org/x/tools/cmd/goimports
go get -u github.com/golang/dep/cmd/dep
dep ensure

format :
Expand All @@ -21,7 +31,7 @@ format :

build :
@echo "== build"
@go install -v ./cmd/...
@go install -v ./feed-ingress/... ./feed-dns/...

unformatted = $(shell goimports -l $(files))

Expand Down
Loading