Fix bloody ingress Argocd

k8s/core/argocd/ingress.yaml

@@ -1,15 +1,16 @@
----
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: argocd-tls-ingress
+  name: argocd
   namespace: argocd
   annotations:
-    ingressClassName: traefik
     cert-manager.io/cluster-issuer: letsencrypt
-    traefik.ingress.kubernetes.io/router.middlewares: kube-system-https-redirect@kubernetescrd
-    acme.cert-manager.io/http01-edit-in-place: "true"
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
 spec:
+  tls:
+    - hosts:
+        - ag.hexor.cy
+      secretName: argocd-server-tls
   rules:
     - host: ag.hexor.cy
       http:
@@ -20,9 +21,5 @@ spec:
               service:
                 name: argocd-server
                 port:
-                  number: 80
-  tls:
-    - secretName: argocd-tls
-      hosts:
-        - ag.hexor.cy
+                  number: 443
 

k8s/core/argocd/kustomization.yaml

@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
-  - ingress.yaml
+resources: []
+# - ingress.yaml
 
 helmCharts:
   - name: argo-cd

k8s/core/argocd/values.yaml

@@ -72,13 +72,20 @@ redis-ha:
 
 # Argo CD Server (API and UI)
 server:
+  replicas: 1
   args:
     - --insecure
-  replicas: 1
-
-  # Ingress settings
+  service:
+    ports:
+      http: 80
   ingress:
-    enabled: false
+    enabled: true
+    hostname: ag.hexor.cy
+    ingressClassName: traefik
+    annotations:
+      cert-manager.io/cluster-issuer: letsencrypt
+    tls: true
+    https: false
 
   certificate:
     enabled: false