From 8a9425b1502197309521dc68a4cef3dda6fbbee0 Mon Sep 17 00:00:00 2001
From: dobiadi <dobi@ktk.bme.hu>
Date: Fri, 25 Oct 2024 01:16:27 +0200
Subject: [PATCH] Fixes

---
 argocd/values.yaml  |  6 ++++--
 linkerd/Chart.lock  |  7 ++-----
 linkerd/Chart.yaml  |  3 ---
 linkerd/values.yaml | 19 +++++++++----------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/argocd/values.yaml b/argocd/values.yaml
index b3c5001..092ab8b 100644
--- a/argocd/values.yaml
+++ b/argocd/values.yaml
@@ -4,7 +4,7 @@ argo-cd:
       server.insecure: true
   installCRDs: true
   global:
-    domain: 'argo.localhost'
+    domain: "argo.localhost"
   server:
     ingress:
       enabled: true
@@ -13,6 +13,9 @@ argo-cd:
       linkerd.io/inject: enabled
     service:
       annotations:
+        nginx.ingress.kubernetes.io/ssl-redirect: "false"
+        nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+        nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
         nginx.ingress.kubernetes.io/service-upstream: "true"
   repoServer:
     podAnnotations:
@@ -40,4 +43,3 @@ argo-rollouts:
       hosts:
         - argo-rollouts.localhost
       ingressClassName: nginx
-
diff --git a/linkerd/Chart.lock b/linkerd/Chart.lock
index c94df25..f864c5f 100644
--- a/linkerd/Chart.lock
+++ b/linkerd/Chart.lock
@@ -8,8 +8,5 @@ dependencies:
 - name: linkerd-control-plane
   repository: https://helm.linkerd.io/edge
   version: 2024.10.3
-- name: linkerd-smi
-  repository: https://linkerd.github.io/linkerd-smi
-  version: 1.0.4
-digest: sha256:a6d8b821aa6df5d0bb843ba307424c3c7adabd30ef28b585614c0832943ce9ec
-generated: "2024-10-23T23:45:08.229839318+02:00"
+digest: sha256:ba7238403d4940cb1af0b4e748bbeedad788239cadb2ae0bb355391f14cb6a74
+generated: "2024-10-25T00:16:58.601415693+02:00"
diff --git a/linkerd/Chart.yaml b/linkerd/Chart.yaml
index 6af602a..d1bbced 100644
--- a/linkerd/Chart.yaml
+++ b/linkerd/Chart.yaml
@@ -13,6 +13,3 @@ dependencies:
 - name: linkerd-control-plane
   version: "2024.10.3"
   repository: "https://helm.linkerd.io/edge"
-- name: linkerd-smi
-  version: "1.0.4"
-  repository: "https://linkerd.github.io/linkerd-smi"
diff --git a/linkerd/values.yaml b/linkerd/values.yaml
index e1acba7..27593c5 100644
--- a/linkerd/values.yaml
+++ b/linkerd/values.yaml
@@ -5,19 +5,18 @@ linkerd-control-plane:
       scheme: kubernetes.io/tls
   identityTrustAnchorsPEM: |
     -----BEGIN CERTIFICATE-----
-    MIIBjjCCATSgAwIBAgIRALFMxwXuxeFAIPXzJnwl35IwCgYIKoZIzj0EAwIwJTEj
-    MCEGA1UEAxMacm9vdC5saW5rZXJkLmNsdXN0ZXIubG9jYWwwHhcNMjQxMDE5MjM0
-    NTQyWhcNMzQxMDE3MjM0NTQyWjAlMSMwIQYDVQQDExpyb290LmxpbmtlcmQuY2x1
-    c3Rlci5sb2NhbDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABM9+FB46xXRcqAwC
-    YaZ0nCESy31TU6wk3ED5b4RGkM+W0HCjr6FkJ/bdiZalwGZ5CmYo2skOvdMNMiOI
-    DpDcW6yjRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEBMB0G
-    A1UdDgQWBBSS3w3dDp+eYTqv/r/6aWX1HCGkTTAKBggqhkjOPQQDAgNIADBFAiBA
-    2HeSIMA42bJtg4VImveysgdrHUEuLkvqyDt4NzPEFwIhAMsFnvGKdBlW0kckLWeN
-    KNZoN1TwbI/Hvdhh0EJRgx8e
+    MIIBjTCCATOgAwIBAgIQOOvm1fwbj66IoBnM+oKjbzAKBggqhkjOPQQDAjAlMSMw
+    IQYDVQQDExpyb290LmxpbmtlcmQuY2x1c3Rlci5sb2NhbDAeFw0yNDEwMjQyMjIx
+    MjVaFw0zNDEwMjIyMjIxMjVaMCUxIzAhBgNVBAMTGnJvb3QubGlua2VyZC5jbHVz
+    dGVyLmxvY2FsMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELj/OdEiXV5kUJAha
+    7+dKe4yiViuVtDMkhzIaWoR/ZHqd270MWXvoBpNP9emICtX/3ihRkO12WHOLtnPi
+    GXFc1aNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYD
+    VR0OBBYEFHDt80xkzE3Exi1WM+VVzzyXhEQoMAoGCCqGSM49BAMCA0gAMEUCIQDX
+    BpIMV3NMh5L43WVSrcTTy1CzPjRgvuVLXiywYJyBvAIgdL0sulAwaHxROQs4Unxb
+    tIay7PKwoMrycoW6DiZV4C8=
     -----END CERTIFICATE-----
   proxy:
     nativeSidecar: true
-
 linkerd2-cni:
   repairController:
     enabled: true