From 0ae329e636862d34b71288bd30dde5c624c3de05 Mon Sep 17 00:00:00 2001
From: DeveloperDurp <developerdurp@durp.info>
Date: Sat, 9 Mar 2024 08:11:18 -0600
Subject: [PATCH] update

---
 kong/Chart.yaml             |   4 +-
 kong/templates/ingress.yaml | 106 ------------------------------------
 kong/templates/secrets.yaml |  19 -------
 kong/values.yaml            |  35 +++---------
 4 files changed, 10 insertions(+), 154 deletions(-)
 delete mode 100644 kong/templates/ingress.yaml
 delete mode 100644 kong/templates/secrets.yaml

diff --git a/kong/Chart.yaml b/kong/Chart.yaml
index a8a6cd6..535f951 100644
--- a/kong/Chart.yaml
+++ b/kong/Chart.yaml
@@ -7,6 +7,6 @@ version: 0.1.0
 appVersion: "1.16.0"
 
 dependencies:
-- name: kong
+- name: ingress 
   repository: https://charts.konghq.com
-  version: 2.23.0
+  version: 0.12.0
diff --git a/kong/templates/ingress.yaml b/kong/templates/ingress.yaml
deleted file mode 100644
index 712700f..0000000
--- a/kong/templates/ingress.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: kong-tls
-spec:
-  secretName: kong-tls
-  issuerRef:
-    name: letsencrypt-production
-    kind: ClusterIssuer
-  commonName: "kong.durp.info"
-  dnsNames:
-  - "kong.durp.info"        
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: kong-kong-proxy
-  namespace: kong
-spec:
-  entryPoints:
-    - websecure
-  routes:
-    - match: Host(`kong.durp.info`) && PathPrefix(`/`)
-      kind: Rule
-      services:
-        - name: kong-kong-proxy
-          port: 443
-          scheme: https
-  tls:
-    secretName: kong-tls
-
----
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: developer-external-dns
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: developer.durp.info
-spec:
-  type: ExternalName
-  externalName: a89ff7f4357c.us.portal.konghq.com
-
----
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: kong-external-dns
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: kong.durp.info
-spec:
-  type: ExternalName
-  externalName: durp.info
-
----
-
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: api-tls
-spec:
-  secretName: api-tls
-  issuerRef:
-    name: letsencrypt-production
-    kind: ClusterIssuer
-  commonName: "api.durp.info"
-  dnsNames:
-  - "api.durp.info"        
-
----
-
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: kong-api-proxy
-  namespace: kong
-spec:
-  entryPoints:
-    - websecure
-  routes:
-    - match: Host(`api.durp.info`) && PathPrefix(`/`)
-      middlewares:
-      - name: authentik-proxy-provider
-        namespace: traefik
-      kind: Rule
-      services:
-        - name: kong-kong-proxy
-          port: 443
-          scheme: https
-  tls:
-    secretName: api-tls
-
----
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: api-external-dns
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: api.durp.info
-spec:
-  type: ExternalName
-  externalName: durp.info
diff --git a/kong/templates/secrets.yaml b/kong/templates/secrets.yaml
deleted file mode 100644
index abe44d4..0000000
--- a/kong/templates/secrets.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: kong-cluster-cert
-spec:
-  secretStoreRef:
-    name: vault
-    kind: ClusterSecretStore
-  target:
-    name: kong-cluster-cert
-  data:
-  - secretKey: tls.crt
-    remoteRef:
-      key: secrets/kong/tls
-      property: cert
-  - secretKey: tls.key
-    remoteRef:
-      key: secrets/kong/tls
-      property: key
diff --git a/kong/values.yaml b/kong/values.yaml
index 3359f25..587f0e1 100644
--- a/kong/values.yaml
+++ b/kong/values.yaml
@@ -1,28 +1,9 @@
 kong:
-  image:
-    repository: kong/kong-gateway
-    tag: "3.3"
-  
-  secretVolumes:
-  - kong-cluster-cert
-  
-  admin:
-    enabled: false
-  
-  env:
-    role: data_plane
-    database: "off"
-    cluster_mtls: pki
-    cluster_control_plane: a0791ed975.us.cp0.konghq.com:443
-    cluster_server_name: a0791ed975.us.cp0.konghq.com
-    cluster_telemetry_endpoint: a0791ed975.us.tp0.konghq.com:443
-    cluster_telemetry_server_name: a0791ed975.us.tp0.konghq.com
-    cluster_cert: /etc/secrets/kong-cluster-cert/tls.crt
-    cluster_cert_key: /etc/secrets/kong-cluster-cert/tls.key
-    lua_ssl_trusted_certificate: system
-    konnect_mode: "on"
-    vitals: "off"
-  
-  ingressController:
-    enabled: false
-    installCRDs: false
+  controller:
+   ingressController:
+     image:
+       repository: kong/kubernetes-ingress-controller
+       tag: "3.1.0"
+  gateway:
+   env:
+     router_flavor: expressions