Merge pull request #44 from cybozu-go/contour-v1.6.0

Upgrade Contour to v1.6.0

Makefile

@@ -26,7 +26,7 @@ test: vet manifests
 	go test -race -v -count 1 ./controllers/... -coverprofile cover.out
 
 # Build contour-plus binary
-bin/contour-plus: main.go cmd/root.go controllers/ingressroute_controller.go controllers/httpproxy_controller.go
+bin/contour-plus: main.go cmd/root.go controllers/httpproxy_controller.go
 	CGO_ENABLED=0 go build -o $@ .
 
 # Generate manifests e.g. CRD, RBAC etc.

README.md

@@ -16,19 +16,19 @@ Supported environments
 - Kubernetes
   - 1.17
 - Contour
-  - 1.0
+  - 1.6
 - ExternalDNS
-  - 0.5
+  - 0.7
 - cert-manager
-  - 0.12
+  - 0.15
 
 Other versions may or may not work.
 
 Features
 --------
 
-- Create/update/delete [DNSEndpoint][] for ExternalDNS according to FQDN in [IngressRoute][]/[HTTPProxy][].
-- Create/update/delete [Certificate][] for cert-manager when [IngressRoute][]/[HTTPProxy][] is annotated with `kubernetes.io/tls-acme: true`.
+- Create/update/delete [DNSEndpoint][] for ExternalDNS according to FQDN in [HTTPProxy][].
+- Create/update/delete [Certificate][] for cert-manager when [HTTPProxy][] is annotated with `kubernetes.io/tls-acme: true`.
 
 Other features are described in [docs/usage.md](docs/usage.md).
 
@@ -42,7 +42,6 @@ Documentation
 [Contour]: https://github.com/heptio/contour
 [ExternalDNS]: https://github.com/kubernetes-incubator/external-dns
 [cert-manager]: https://github.com/jetstack/cert-manager
-[IngressRoute]: https://github.com/heptio/contour/blob/master/docs/ingressroute.md
 [HTTPProxy]: https://github.com/projectcontour/contour/blob/master/site/docs/master/httpproxy.md
 [DNSEndpoint]: https://github.com/kubernetes-incubator/external-dns/blob/master/docs/contributing/crd-source.md
 [Certificate]: http://docs.cert-manager.io/en/latest/reference/certificates.html

RELEASE.md

@@ -37,15 +37,16 @@ Bump version
 2. Checkout `master` branch.
 3. Make a branch to release, for example by `git neco dev "$VERSION"`
 4. Edit `CHANGELOG.md` for the new version ([example][]).
-5. Commit the change and push it.
+5. Edit `README.md` for the new version ([readme-example][]) if needed.
+6. Commit the change and push it.
 
     ```console
     $ git commit -a -m "Bump version to $VERSION"
     $ git neco review
     ```
-6. Merge this branch.
-7. Checkout `master` branch.
-8. Add a git tag, then push it.
+7. Merge this branch.
+8. Checkout `master` branch.
+9. Add a git tag, then push it.
 
     ```console
     $ git tag "v$VERSION"
@@ -63,3 +64,4 @@ Finally, press `Publish release` button.
 
 [semver]: https://semver.org/spec/v2.0.0.html
 [example]: https://github.com/cybozu-go/etcdpasswd/commit/77d95384ac6c97e7f48281eaf23cb94f68867f79
+[readme-example]: https://github.com/cybozu-go/contour-plus/commit/858163c5bee47fbf9f5fe2f2a28c7b997e23d7da

cmd/root.go

@@ -66,8 +66,8 @@ func init() {
 
 var rootCmd = &cobra.Command{
 	Use:   "contour-plus",
-	Short: "contour-plus is a custom controller for Contour IngressRoute/HTTPProxy",
-	Long: `contour-plus is a custom controller for Contour IngressRoute/HTTPProxy.
+	Short: "contour-plus is a custom controller for Contour HTTPProxy",
+	Long: `contour-plus is a custom controller for Contour HTTPProxy.
 	
 In addition to flags, the following environment variables are read: