From c80d0eb4dae050ed4e832bb84995a79c73371c6e Mon Sep 17 00:00:00 2001
From: JonaKl <jona.klaess@rh-campus.de>
Date: Tue, 17 Mar 2026 20:29:06 +0100
Subject: [PATCH] use patch for argocd-cm, as it is already created by
 install.yaml

---
 argocd/argocd-cm-patch.yaml |  14 +++++
 argocd/argocd-cm.yaml       | 110 ------------------------------------
 argocd/kustomization.yaml   |   4 +-
 3 files changed, 17 insertions(+), 111 deletions(-)
 create mode 100644 argocd/argocd-cm-patch.yaml
 delete mode 100644 argocd/argocd-cm.yaml

diff --git a/argocd/argocd-cm-patch.yaml b/argocd/argocd-cm-patch.yaml
new file mode 100644
index 0000000..5df917a
--- /dev/null
+++ b/argocd/argocd-cm-patch.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-cm
+  namespace: argocd
+data:
+  oidc.config: |
+    name: Keycloak
+    issuer: https://keycloak.controller.bittehackmichnicht.de/realms/bachelor
+    clientID: argo
+    clientSecret: $oidc.keycloak.clientSecret
+    refreshTokenThreshold: 2m
+    requestedScopes: ["openid", "profile", "email", "groups"]
+  url: https://argo.k8s.bittehackmichnicht.de
diff --git a/argocd/argocd-cm.yaml b/argocd/argocd-cm.yaml
deleted file mode 100644
index d8cad89..0000000
--- a/argocd/argocd-cm.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: argocd-cm
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: argocd-cm
-    app.kubernetes.io/part-of: argocd
-data:
-  url: https://argo.k8s.bittehackmichnicht.de
-  oidc.config: |
-    name: Keycloak
-    issuer: https://keycloak.controller.bittehackmichnicht.de/realms/bachelor
-    clientID: argo
-    clientSecret: $oidc.keycloak.clientSecret
-    refreshTokenThreshold: 2m
-    requestedScopes: ["openid", "profile", "email", "groups"]
-  resource.customizations.ignoreResourceUpdates.ConfigMap: |
-    jqPathExpressions:
-      # Ignore the cluster-autoscaler status
-      - '.metadata.annotations."cluster-autoscaler.kubernetes.io/last-updated"'
-      # Ignore the annotation of the legacy Leases election
-      - '.metadata.annotations."control-plane.alpha.kubernetes.io/leader"'
-  resource.customizations.ignoreResourceUpdates.Endpoints: |
-    jsonPointers:
-      - /metadata
-      - /subsets
-  resource.customizations.ignoreResourceUpdates.all: |
-    jsonPointers:
-      - /status
-  resource.customizations.ignoreResourceUpdates.apps_ReplicaSet: |
-    jqPathExpressions:
-      - '.metadata.annotations."deployment.kubernetes.io/desired-replicas"'
-      - '.metadata.annotations."deployment.kubernetes.io/max-replicas"'
-      - '.metadata.annotations."rollout.argoproj.io/desired-replicas"'
-  resource.customizations.ignoreResourceUpdates.argoproj.io_Application: |
-    jqPathExpressions:
-      - '.metadata.annotations."notified.notifications.argoproj.io"'
-      - '.metadata.annotations."argocd.argoproj.io/refresh"'
-      - '.metadata.annotations."argocd.argoproj.io/hydrate"'
-      - '.operation'
-  resource.customizations.ignoreResourceUpdates.argoproj.io_Rollout: |
-    jqPathExpressions:
-      - '.metadata.annotations."notified.notifications.argoproj.io"'
-  resource.customizations.ignoreResourceUpdates.autoscaling_HorizontalPodAutoscaler: |
-    jqPathExpressions:
-      - '.metadata.annotations."autoscaling.alpha.kubernetes.io/behavior"'
-      - '.metadata.annotations."autoscaling.alpha.kubernetes.io/conditions"'
-      - '.metadata.annotations."autoscaling.alpha.kubernetes.io/metrics"'
-      - '.metadata.annotations."autoscaling.alpha.kubernetes.io/current-metrics"'
-  resource.customizations.ignoreResourceUpdates.discovery.k8s.io_EndpointSlice: |
-    jsonPointers:
-      - /metadata
-      - /endpoints
-      - /ports
-  resource.exclusions: |
-    ### Network resources created by the Kubernetes control plane and excluded to reduce the number of watched events and UI clutter
-    - apiGroups:
-      - ''
-      - discovery.k8s.io
-      kinds:
-      - Endpoints
-      - EndpointSlice
-    ### Internal Kubernetes resources excluded reduce the number of watched events
-    - apiGroups:
-      - coordination.k8s.io
-      kinds:
-      - Lease
-    ### Internal Kubernetes Authz/Authn resources excluded reduce the number of watched events
-    - apiGroups:
-      - authentication.k8s.io
-      - authorization.k8s.io
-      kinds:
-      - SelfSubjectReview
-      - TokenReview
-      - LocalSubjectAccessReview
-      - SelfSubjectAccessReview
-      - SelfSubjectRulesReview
-      - SubjectAccessReview
-    ### Intermediate Certificate Request excluded reduce the number of watched events
-    - apiGroups:
-      - certificates.k8s.io
-      kinds:
-      - CertificateSigningRequest
-    - apiGroups:
-      - cert-manager.io
-      kinds:
-      - CertificateRequest
-    ### Cilium internal resources excluded reduce the number of watched events and UI Clutter
-    - apiGroups:
-      - cilium.io
-      kinds:
-      - CiliumIdentity
-      - CiliumEndpoint
-      - CiliumEndpointSlice
-    ### Kyverno intermediate and reporting resources excluded reduce the number of watched events and improve performance
-    - apiGroups:
-      - kyverno.io
-      - reports.kyverno.io
-      - wgpolicyk8s.io
-      kinds:
-      - PolicyReport
-      - ClusterPolicyReport
-      - EphemeralReport
-      - ClusterEphemeralReport
-      - AdmissionReport
-      - ClusterAdmissionReport
-      - BackgroundScanReport
-      - ClusterBackgroundScanReport
-      - UpdateRequest
\ No newline at end of file
diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml
index c99c5ad..4015c85 100644
--- a/argocd/kustomization.yaml
+++ b/argocd/kustomization.yaml
@@ -3,7 +3,9 @@ kind: Kustomization
 
 resources:
   - https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
-  - argocd-cm.yaml
   - argocd-istio.yaml
   - argocd-rbac-cm.yaml
   - argocd-self-application.yaml
+
+patchesStrategicMerge:
+  - argocd-cm-patch.yaml