From 350661b085b8c4684a1703988b17e1e5628b3251 Mon Sep 17 00:00:00 2001
From: Shubham Gupta <sgupta@obmondo.com>
Date: Fri, 6 Sep 2024 16:52:08 +0530
Subject: [PATCH] chore: Remove Middleware and Use Ingress Route

Signed-off-by: Shubham Gupta <sgupta@obmondo.com>
---
 .../templates/puppetdb-ingressroutetcp.yaml         | 13 ++++++-------
 .../templates/puppetdb-middlewaretcp.yaml           | 10 ----------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 argocd-helm-charts/puppetserver/templates/puppetdb-middlewaretcp.yaml

diff --git a/argocd-helm-charts/puppetserver/templates/puppetdb-ingressroutetcp.yaml b/argocd-helm-charts/puppetserver/templates/puppetdb-ingressroutetcp.yaml
index 1d6e2238a..82dbba4b0 100644
--- a/argocd-helm-charts/puppetserver/templates/puppetdb-ingressroutetcp.yaml
+++ b/argocd-helm-charts/puppetserver/templates/puppetdb-ingressroutetcp.yaml
@@ -1,20 +1,19 @@
 apiVersion: traefik.io/v1alpha1
-kind: IngressRouteTCP
+kind: IngressRoute
 metadata:
   name: puppetdb-{{ .Values.customerid }}
 spec:
   entryPoints:
     - websecure
   routes:
-  - match: HostSNI(`{{ .Values.customerid }}.puppetdb.obmondo.com`)
+  - kind: Rule
+    match: Host(`{{ .Values.customerid }}.puppetdb.obmondo.com`)
     priority: 10
     services:
-    - name: puppetserver-{{ .Values.customerid }}-puppetdb
-      port: pdb-https
-    middlewares:
-      - name: middlewaretcp-{{ .Values.customerid }}
+    - kind: Service
+      name: puppetserver-{{ .Values.customerid }}-puppetdb
+      port: pdb-http
   tls:
-    passthrough: true
     options:
       name: prometheus-puppet-agent-tls-auth
       namespace: traefik
\ No newline at end of file
diff --git a/argocd-helm-charts/puppetserver/templates/puppetdb-middlewaretcp.yaml b/argocd-helm-charts/puppetserver/templates/puppetdb-middlewaretcp.yaml
deleted file mode 100644
index b629133f8..000000000
--- a/argocd-helm-charts/puppetserver/templates/puppetdb-middlewaretcp.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: traefik.io/v1alpha1
-kind: MiddlewareTCP
-metadata:
-  name: middlewaretcp-{{ .Values.customerid }}
-spec:
-  ipAllowList:
-    sourceRange:
-      {{- range .Values.ipAllowedList }}
-      - "{{ . }}"
-      {{- end }}