Merge pull request #53 from cybozu-go/contour-1.11.0

Update contour dependency to 1.11.0

.circleci/config.yml

@@ -2,24 +2,14 @@ version: 2
 jobs:
   build:
     docker:
-      - image: quay.io/cybozu/golang:1.13-bionic
+      - image: quay.io/cybozu/golang:1.15-focal
     working_directory: /work
     environment:
       TEST_RESULTS: /tmp/test-results
     steps:
       - checkout
       - run: make SUDO="" setup
-      - run:
-          name: Run tests
-          command: |
-            mkdir -p ${TEST_RESULTS}
-            trap "go-junit-report <${TEST_RESULTS}/go-test.out > ${TEST_RESULTS}/go-test-report.xml" EXIT
-            make test | tee ${TEST_RESULTS}/go-test.out
-      - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
-          path: /tmp/test-results
-          destination: raw-test-output
-      - store_test_results: # Upload test results for display in Test Summary: https://circleci.com/docs/2.0/collect-test-data/
-          path: /tmp/test-results
+      - run: make test
       - run: make
       - persist_to_workspace:
           root: /work/bin

CHANGELOG.md

@@ -5,14 +5,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.6.0] - 2021-02-01
+
+### Changed
+
+- Update contour to 1.11.0 (#53)
+- Update controller-runtime to 0.7.2 (#53)
+
 ## [0.5.2] - 2020-10-20
 
 ### Changed
 
 - Update contour to 1.9.0 (#48).
 - Use cert-manager v1 API Endpoint (#48).
 - Remove compile dependency on cert-manager and external-dns (#48).
-- Stop using vendoring (#50).
+- Stop vendoring dependencies (#50).
 
 ## [0.5.1] - 2020-10-02
 
@@ -140,7 +147,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
     - for [ExternalDNS][] v0.5.14
     - for [cert-manager][] v0.8.0
 
-[Unreleased]: https://github.com/cybozu-go/contour-plus/compare/v0.5.2...HEAD
+[Unreleased]: https://github.com/cybozu-go/contour-plus/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/cybozu-go/contour-plus/compare/v0.5.2...v0.6.0
 [0.5.2]: https://github.com/cybozu-go/contour-plus/compare/v0.5.1...v0.5.2
 [0.5.1]: https://github.com/cybozu-go/contour-plus/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/cybozu-go/contour-plus/compare/v0.4.3...v0.5.0

Makefile

@@ -13,9 +13,9 @@ GOARCH = $(shell go env GOARCH)
 SUDO = sudo
 KUBEBUILDER_VERSION = 2.3.1
 CTRLTOOLS_VERSION = 0.2.8
-CERT_MANAGER_VERSION := 1.0.3
-EXTERNAL_DNS_VERSION := 0.7.4
-CONTOUR_VERSION := 1.9.0
+CERT_MANAGER_VERSION := 1.1.0
+EXTERNAL_DNS_VERSION := 0.7.6
+CONTOUR_VERSION := 1.11.0
 
 .PHONY: all
 all: bin/contour-plus
@@ -27,14 +27,13 @@ test:
 	staticcheck ./...
 	test -z "$$(nilerr ./... 2>&1 | tee /dev/stderr)"
 	test -z "$$(custom-checker -restrictpkg.packages=html/template,log $$(go list -tags='$(GOTAGS)' ./... ) 2>&1 | tee /dev/stderr)"
-	ineffassign .
 	go test -race -v -count 1 ./controllers/... -coverprofile cover.out
 	go install ./...
 	go vet ./...
 
 # Build contour-plus binary
 bin/contour-plus: main.go cmd/root.go controllers/httpproxy_controller.go
-	CGO_ENABLED=0 go build -o $@ .
+	CGO_ENABLED=0 go build -ldflags="-w -s" -o $@ .
 
 # Generate manifests e.g. CRD, RBAC etc.
 .PHONY: manifests
@@ -74,14 +73,13 @@ clean:
 	rm -f bin/contour-plus $(CONTROLLER_GEN)
 
 .PHONY: setup
-setup: custom-checker staticcheck nilerr ineffassign
+setup: custom-checker staticcheck nilerr
 	mkdir -p bin
 	curl -sfL https://go.kubebuilder.io/dl/$(KUBEBUILDER_VERSION)/$(GOOS)/$(GOARCH) | tar -xz -C /tmp/
 	mv /tmp/kubebuilder_$(KUBEBUILDER_VERSION)_$(GOOS)_$(GOARCH)/bin/* bin/
 	rm -rf /tmp/kubebuilder_*
 	curl -o bin/kustomize -sfL https://go.kubebuilder.io/kustomize/$(GOOS)/$(GOARCH)
 	chmod a+x bin/kustomize
-	go install github.com/jstemmer/go-junit-report
 
 .PHONY: mod
 mod:
@@ -111,9 +109,3 @@ nilerr:
 	if ! which nilerr >/dev/null; then \
 		cd /tmp; env GOFLAGS= GO111MODULE=on go get github.com/gostaticanalysis/nilerr/cmd/nilerr; \
 	fi
-
-.PHONY: ineffassign
-ineffassign:
-	if ! which ineffassign >/dev/null; then \
-		cd /tmp; env GOFLAGS= GO111MODULE=on go get github.com/gordonklaus/ineffassign; \
-	fi

README.md

@@ -38,11 +38,11 @@ Documentation
 [docs](docs/) directory contains documents about designs and specifications.
 
 [releases]: https://github.com/cybozu-go/contour-plus/releases
-[godoc]: https://godoc.org/github.com/cybozu-go/contour-plus
+[godoc]: https://pkg.go.dev/github.com/cybozu-go/contour-plus
 [Contour]: https://github.com/projectcontour/contour
 [ExternalDNS]: https://github.com/kubernetes-sigs/external-dns
 [cert-manager]: https://github.com/jetstack/cert-manager
-[HTTPProxy]: https://github.com/projectcontour/contour/blob/master/site/docs/master/httpproxy.md
+[HTTPProxy]: https://projectcontour.io/docs/v1.11.0/config/api/#projectcontour.io/v1.HTTPProxy
 [DNSEndpoint]: https://github.com/kubernetes-sigs/external-dns/blob/master/docs/contributing/crd-source.md
 [Certificate]: http://docs.cert-manager.io/en/latest/reference/certificates.html
 

RELEASE.md

@@ -34,7 +34,7 @@ Bump version
 ------------
 
 1. Determine a new version number.  Let it write `$VERSION` as `VERSION=x.y.z`.
-2. Checkout `master` branch.
+2. Checkout `main` branch.
 3. Make a branch to release, for example by `git neco dev "$VERSION"`
 4. Edit `CHANGELOG.md` for the new version ([example][]).
 5. Edit `README.md` for the new version ([readme-example][]) if needed.
@@ -45,7 +45,7 @@ Bump version
     $ git neco review
     ```
 7. Merge this branch.
-8. Checkout `master` branch.
+8. Checkout `main` branch.
 9. Add a git tag, then push it.
 
     ```console