diff --git a/README.md b/README.md index bc7e2ad..77859a7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# webhook-interseptor +# webhook-interceptor -The Webhook Interseptor checks for specific conditions when a webhook is received. +The Webhook Interceptor checks for specific conditions when a webhook is received. This way we can trigger cleanups when the PR is closed. @@ -9,13 +9,13 @@ This way we can trigger cleanups when the PR is closed. ## Push Event ``` -X-Interseptor-Ref: refs/heads/master +X-Interceptor-Ref: refs/heads/master ``` ## Pull-Request Event ``` -X-Interseptor-Action: [create|delete] +X-Interceptor-Action: [create|delete] ``` ## Issue Comment Event @@ -23,7 +23,7 @@ X-Interseptor-Action: [create|delete] **TBD** ``` -X-Interseptor-Comment: /test +X-Interceptor-Comment: /test ``` # Build and run diff --git a/config/00-namespace.yaml b/config/00-namespace.yaml index bd8ba5f..2d62c68 100644 --- a/config/00-namespace.yaml +++ b/config/00-namespace.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: webhook-interseptor + name: webhook-interceptor diff --git a/config/01-podsecuritypolicy.yaml b/config/01-podsecuritypolicy.yaml index 449b28c..ab64ada 100644 --- a/config/01-podsecuritypolicy.yaml +++ b/config/01-podsecuritypolicy.yaml @@ -1,7 +1,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: webhook-interseptor + name: webhook-interceptor spec: privileged: false allowPrivilegeEscalation: false diff --git a/config/02-sa.yaml b/config/02-sa.yaml index 9bd3c37..8030a0f 100644 --- a/config/02-sa.yaml +++ b/config/02-sa.yaml @@ -1,32 +1,32 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: webhook-interseptor - namespace: webhook-interseptor + name: webhook-interceptor + namespace: webhook-interceptor --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: webhook-interseptor - namespace: webhook-interseptor + name: webhook-interceptor + namespace: webhook-interceptor rules: - apiGroups: [""] resources: ["secrets"] verbs: ["get"] - apiGroups: ["policy"] resources: ["podsecuritypolicies"] - resourceNames: ["webhook-interseptor"] + resourceNames: ["webhook-interceptor"] verbs: ["use"] --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: webhook-interseptor - namespace: webhook-interseptor + name: webhook-interceptor + namespace: webhook-interceptor roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: webhook-interseptor + name: webhook-interceptor subjects: - kind: ServiceAccount - name: webhook-interseptor + name: webhook-interceptor diff --git a/config/deployment.yaml b/config/deployment.yaml index 6d0729d..01ef287 100644 --- a/config/deployment.yaml +++ b/config/deployment.yaml @@ -1,24 +1,24 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: webhook-interseptor - namespace: webhook-interseptor + name: webhook-interceptor + namespace: webhook-interceptor labels: - app: webhook-interseptor + app: webhook-interceptor spec: replicas: 1 selector: matchLabels: - app: webhook-interseptor + app: webhook-interceptor template: metadata: labels: - app: webhook-interseptor + app: webhook-interceptor spec: - serviceAccountName: webhook-interseptor + serviceAccountName: webhook-interceptor containers: - - name: webhook-interseptor - image: git.giftfish.de/ston1th/webhook-interseptor + - name: webhook-interceptor + image: git.giftfish.de/ston1th/webhook-interceptor resources: requests: cpu: 100m diff --git a/config/service.yaml b/config/service.yaml index bdc7e14..f42caa4 100644 --- a/config/service.yaml +++ b/config/service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: webhook-interseptor - namespace: webhook-interseptor + name: webhook-interceptor + namespace: webhook-interceptor labels: - app: webhook-interseptor + app: webhook-interceptor spec: type: ClusterIP ports: @@ -12,4 +12,4 @@ spec: port: 80 targetPort: 8080 selector: - app: webhook-interseptor + app: webhook-interceptor diff --git a/main.go b/main.go index 4fdb40f..e5eabb4 100644 --- a/main.go +++ b/main.go @@ -1,11 +1,11 @@ package main import ( + "encoding/json" + "io/ioutil" "log" "net/http" - "encoding/json" "time" - "io/ioutil" ) var version string @@ -31,12 +31,12 @@ func prHandler(w http.ResponseWriter, r *http.Request) { } switch pr.Action { case "opened", "reopened", "synchronize": - if r.Header.Get("X-Interseptor-Action") == "create" { + if r.Header.Get("X-Interceptor-Action") == "create" { w.Write(body) return } case "closed": - if r.Header.Get("X-Interseptor-Action") == "delete" { + if r.Header.Get("X-Interceptor-Action") == "delete" { w.Write(body) return } @@ -63,7 +63,7 @@ func pushHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } - if r.Header.Get("X-Interseptor-Ref") == p.Ref { + if r.Header.Get("X-Interceptor-Ref") == p.Ref { w.Write(body) return } @@ -93,7 +93,7 @@ func commentHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } - if r.Header.Get("X-Interseptor-Comment") == c.Comment.Body { + if r.Header.Get("X-Interceptor-Comment") == c.Comment.Body { w.Write(body) return }