From dcb9e887f9b0d9efcedc58b86b792a9558277c4a Mon Sep 17 00:00:00 2001
From: "Adam A.G. Shamblin" <adam@vexingworkshop.com>
Date: Fri, 12 Nov 2021 10:57:43 -0700
Subject: [PATCH] Update ingress

---
 charts/pipeline/helm_vars/secrets.yaml  |  7 +++++--
 charts/pipeline/templates/ingress.yaml  | 23 +++++++++++++++++++++++
 charts/pipeline/templates/pipeline.yaml |  3 ++-
 charts/pipeline/templates/secret.yaml   | 11 +++++++++--
 charts/pipeline/templates/trigger.yaml  |  4 ++--
 5 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 charts/pipeline/templates/ingress.yaml

diff --git a/charts/pipeline/helm_vars/secrets.yaml b/charts/pipeline/helm_vars/secrets.yaml
index acbab9d..b818dbf 100644
--- a/charts/pipeline/helm_vars/secrets.yaml
+++ b/charts/pipeline/helm_vars/secrets.yaml
@@ -1,11 +1,14 @@
+github:
+    interceptor:
+        secret: ENC[AES256_GCM,data:c7MXYXyHeqJVNF+sBLBhquOLWHuIw8O+s6NEYP+Auw0=,iv:UbQ1myRZZOfefSC9sBSO3092Cstog8VO7zUigC7PMYI=,tag:2CxeahdOjq5rPmUk+FU5gg==,type:str]
 CR_PAT: ENC[AES256_GCM,data:YZI3d8cA1LHck1HROS83ad0h/AnnjA2A+MWzwZJVQs/CkgJ0wjX7fg==,iv:pH9iINbNDd3f7NVf93cZ9LW805OxmlwctPL9DJQnA9E=,tag:pe78jcr+NcMWJPFY18O+eA==,type:str]
 dockerconfigjson: ENC[AES256_GCM,data:b3R9lbb9oZmnAdNmuNX1/pLNpO39Z0ww3jDheGqnCapMAnbZ2uuT6uZ2boBHX73QOuNUS6ygPfwEo3l0hULhcISeV/+qdQBAKa6uUAXAB30LTakG5QAAVU4ZxT6E/h3vQ35UQgguac1bwFdZhR6SgLClvME9xfddyFZGllHyBVqMas2WWv62sY50VbU4vfTyryAy5oe4F1SslsM9Ui3bTRfYqCdyYdY+sBbp2XkTVJQVopYeAlQu7+T9vleJ3bMx3wOAwlMbZ+b15pPczRWtH+AHOd5ytL5w7sFPIGHyRtajR6Y8UtnQoKuUT4+HCrZNrfgWedhr+J+6yxIVShew4OY5mFaK9tJqq54oyygKG9Scc720L/cdrw==,iv:1zZ9T5mZ3cTxuxmHOtTOFjzvJ3zzzoyZ5j3VfUnpDMo=,tag:lbzBff4JzBh2Vh48OPMz6A==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
-    lastmodified: '2021-11-02T22:35:23Z'
-    mac: ENC[AES256_GCM,data:RhZ78qeYRdJBu62vYBKHFeK2TU3B1+KtdbFgU6sEYEb8bXIOnZaIjCbIV4XqozmTbVcyh1DNw4CP1xKu4WAV+A9keDOJbsp0sbTL0MAMhpx0tOm7f2+9QgaT1dnTgd8QaNH0JJerNh+RVHPW5V1U1RKPO2BrsWAN+AluS91NkO0=,iv:51TW0NuDy7ul2CBpKL1+xek6rmerSr3DXfkBmn8CdsE=,tag:NRMgmIYPpVggrm/+jb5gig==,type:str]
+    lastmodified: '2021-11-12T17:41:49Z'
+    mac: ENC[AES256_GCM,data:RLqTZUkPV0yt39plJ0UhcPNosngvJ0pklb2q1EYAeXL56CUYAyTARDzLRkyLi/xNEJ5NwSPUbaixaPBGpx+05ftnU2Aa58RPs4ZArOEaDCEilTpeALsLb/LZvdu202UV8Ng4/wEe0Zc8fPJyQZJKjusYbMfny9ni1hCIOdl9zZc=,iv:ICGIihEeJPX6+P4/w7zkJdI1jJHY/gINhqabgwd0Ch0=,tag:6c6wN7HmwSMy5zOi+gTycw==,type:str]
     pgp:
     -   created_at: '2021-11-02T22:20:13Z'
         enc: |
diff --git a/charts/pipeline/templates/ingress.yaml b/charts/pipeline/templates/ingress.yaml
new file mode 100644
index 0000000..2c21282
--- /dev/null
+++ b/charts/pipeline/templates/ingress.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: github-trigger-ingress
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/cluster-issuer: "acme-prod"
+spec:
+  rules:
+  - host: trigger.vexingworkshop.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: el-cluster-listener
+            port:
+              number: 80
+          path: /
+  tls:
+    - hosts:
+      - trigger.vexingworkshop.com
+      secretName: vexing-tls
diff --git a/charts/pipeline/templates/pipeline.yaml b/charts/pipeline/templates/pipeline.yaml
index c0a293b..a33bc01 100644
--- a/charts/pipeline/templates/pipeline.yaml
+++ b/charts/pipeline/templates/pipeline.yaml
@@ -43,4 +43,5 @@ spec:
       workspaces:
         - name: source
           workspace: source
-    - name: deploy
+        - name: dockerconfig
+          workspace: dockerconfig
diff --git a/charts/pipeline/templates/secret.yaml b/charts/pipeline/templates/secret.yaml
index ea9aaa5..ed68f5c 100644
--- a/charts/pipeline/templates/secret.yaml
+++ b/charts/pipeline/templates/secret.yaml
@@ -1,7 +1,14 @@
+---
 apiVersion: v1
+kind: Secret
+metadata:
+  name: github-interceptor
 data:
-  config.json: {{ .Values.dockerconfigjson }}
+  interceptorSecret: "{{ .Values.github.interceptor.secret }}"
+---
+apiVersion: v1
 kind: Secret
 metadata:
-  creationTimestamp: null
   name: github-docker-config
+data:
+  config.json: {{ .Values.dockerconfigjson }}
diff --git a/charts/pipeline/templates/trigger.yaml b/charts/pipeline/templates/trigger.yaml
index 91ce862..658ff3b 100644
--- a/charts/pipeline/templates/trigger.yaml
+++ b/charts/pipeline/templates/trigger.yaml
@@ -20,8 +20,8 @@ spec:
       params:
         - name: "secretRef"
           value:
-            secretName: github-secret
-            secretKey: secretToken
+            secretName: github-interceptor
+            secretKey: interceptorSecret
         - name: "eventTypes"
           value: ["push"]
     - ref:
-- 
2.39.5