feat(annotations): Add annotations to rewrite requests (#68)

* feat(annotations): Add annotations to rewrite requests

* Upgrade caddy, ingress API version and some other deps

* fix graceful shutdown

* Upgrade caddy to v2.4.6 and add OCSP Check interval to global config

* Add caddy duration parser

Author: Embraser01

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.2-alpine AS builder
+FROM golang:1.16.7-alpine AS builder
 WORKDIR /app
 
 COPY go.mod go.sum ./
@@ -13,7 +13,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/ingress-controller .
 FROM alpine:latest AS certs
 RUN apk --update add ca-certificates
 
-FROM scratch
+FROM alpine:latest
 COPY --from=builder /app/bin/ingress-controller .
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 EXPOSE 80 443

README.md

@@ -5,7 +5,12 @@ for monitoring `Ingress` resources on a Kubernetes cluster and includes support
 for providing automatic HTTPS certificates for all hostnames defined in ingress
 resources that it is managing.
 
-## Cloud Provider Setup (AWS, GCLOUD, ETC...)
+## Prerequisites
+
+- Helm 3+
+- Kubernetes 1.19+
+
+## Setup
 
 In the `charts` folder a Helm Chart is provided to make installing the Caddy
 Ingress Controller on a Kubernetes cluster straight forward. To install the
@@ -14,19 +19,19 @@ Caddy Ingress Controller adhere to the following steps:
 1. Create a new namespace in your cluster to isolate all Caddy resources.
 
 ```sh
-  kubectl create namespace caddy-system
+kubectl create namespace caddy-system
 ```
 
 2. Install the Helm Chart.
 
 ```sh
-  helm install \
-    --namespace=caddy-system \
-    --repo https://caddyserver.github.io/ingress/ \
-    --atomic \
-    --set image.tag=latest \
-    mycaddy \
-    caddy-ingress-controller
+helm install \
+  --namespace=caddy-system \
+  --repo https://caddyserver.github.io/ingress/ \
+  --atomic \
+  --set image.tag=latest \
+  mycaddy \
+  caddy-ingress-controller
 ```
 
 The helm chart create a service of type `LoadBalancer` in the `caddy-system`
@@ -44,7 +49,7 @@ pod logs of the Caddy Ingress Controller.
 Get the pod name with:
 
 ```sh
-  kubectl get pods -n caddy-system
+kubectl get pods -n caddy-system
 ```
 
 View the pod logs:
@@ -61,7 +66,6 @@ the argument `ingressController.autotls=true` and the email to use
 chart values.
 
 Example:
-
  - `--set ingressController.autotls=true`
  - `--set [email protected]`
 
@@ -103,3 +107,11 @@ spec:
     - test.com
     secretName: mycerts # use mycerts for host test.com
 ```
+
+### Contribution
+
+Learn how to start contribution on the [Contributing Guidline](CONTRIBUTING.md).
+
+## License
+
+[Apache License 2.0](LICENSE.txt)

charts/caddy-ingress-controller/Chart.yaml

@@ -4,7 +4,7 @@ home: https://github.com/caddyserver/ingress
 description: A helm chart for the Caddy Kubernetes ingress controller
 icon: https://caddyserver.com/resources/images/caddy-circle-lock.svg
 type: application
-version: 0.0.1-rc3
+version: 0.0.1-rc4
 keywords:
   - ingress-controller
   - caddyserver

charts/caddy-ingress-controller/README.md

@@ -17,7 +17,7 @@ This chart bootstraps a caddy-ingress-deployment deployment on a [Kubernetes](ht
 ## Prerequisites
 
 - Helm 3+
-- Kubernetes 1.14+
+- Kubernetes 1.19+
 
 ## Installing the Chart
 
@@ -60,6 +60,7 @@ The command removes all the Kubernetes components associated with the chart and
 | ingressController.config.proxyProtocol | bool | `false` |  |
 | ingressController.rbac.create | bool | `true` |  |
 | ingressController.verbose | bool | `false` |  |
+| ingressController.leaseId | string | `""` |  |
 | ingressController.watchNamespace | string | `""` |  |
 | minikube | bool | `false` |  |
 | nameOverride | string | `""` |  |

charts/caddy-ingress-controller/templates/deployment.yaml

@@ -70,6 +70,9 @@ spec:
             {{- if .Values.ingressController.watchNamespace }}
             - -namespace={{ .Values.ingressController.watchNamespace }}
             {{- end }}
+            {{- if .Values.ingressController.leaseId }}
+            - -lease-id={{ .Values.ingressController.leaseId }}
+            {{- end }}
             {{- if .Values.ingressController.verbose }}
             - -v
             {{- end }}

charts/caddy-ingress-controller/values.schema.json

@@ -90,6 +90,10 @@
             }
           }
         },
+        "leaseId": {
+          "$id": "#/properties/ingressController/properties/leaseId",
+          "type": "string"
+        },
         "config": {
           "$id": "#/properties/ingressController/properties/config",
           "type": "object",

charts/caddy-ingress-controller/values.yaml

@@ -22,6 +22,7 @@ ingressController:
   rbac:
     create: true
 
+  leaseId: ""
   config:
     # -- Acme Server URL
     acmeCA: ""

cmd/caddy/main.go

@@ -9,6 +9,9 @@ import (
 	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
+	"os"
+	"os/signal"
+	"syscall"
 	"time"
 )
 
@@ -49,15 +52,20 @@ func main() {
 	}
 
 	stopCh := make(chan struct{}, 1)
-	defer close(stopCh)
 
 	c := controller.NewCaddyController(logger, kubeClient, cfg, caddy.Converter{}, stopCh)
 
 	// start the ingress controller
 	logger.Info("Starting the caddy ingress controller")
 	go c.Run()
 
-	// TODO :- listen to sigterm
+	// Listen for SIGINT and SIGTERM signals
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, os.Interrupt, syscall.SIGTERM)
+	<-sigs
+	close(stopCh)
+
+	// Let controller exit the process
 	select {}
 }
 

go.mod

@@ -1,16 +1,15 @@
 module github.com/caddyserver/ingress
 
-go 1.14
+go 1.16
 
 require (
-	github.com/caddyserver/caddy/v2 v2.3.0-rc.1
-	github.com/caddyserver/certmagic v0.12.1-0.20201209195841-b726d1ed13c3
-	github.com/google/uuid v1.1.1
-	github.com/mitchellh/mapstructure v1.1.2
+	github.com/caddyserver/caddy/v2 v2.4.6
+	github.com/caddyserver/certmagic v0.15.2
+	github.com/google/uuid v1.3.0
+	github.com/mitchellh/mapstructure v1.4.3
 	github.com/pires/go-proxyproto v0.3.1
 	github.com/pkg/errors v0.9.1
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.16.0
+	go.uber.org/zap v1.19.0
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/go-playground/pool.v3 v3.1.1
 	k8s.io/api v0.19.4