From fca586f4144d26c360a170b69509e81bfb727938 Mon Sep 17 00:00:00 2001
From: Josef Harte <josefharte@Josefs-MacBook-Pro.local>
Date: Thu, 8 Oct 2026 13:53:05 +0100
Subject: [PATCH 1/2] instana argocd plugin

---
 .secrets.baseline                                    | 12 +++++++++++-
 .../cluster/instana-agent-operator.yaml.j2           |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 962ec0579d7..bc19e702d90 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/",
     "lines": null
   },
-  "generated_at": "2026-10-06T13:11:50Z",
+  "generated_at": "2026-10-08T12:52:59Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -625,6 +625,16 @@
         "verified_result": null
       }
     ],
+    "image/cli/mascli/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2": [
+      {
+        "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 20,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
     "image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-jdbc-config.yaml.j2": [
       {
         "hashed_secret": "146abac680841f15b3e7b5259e1dfcdd9de49fdd",
diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2
index 92013becf01..53630a3386c 100644
--- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2
+++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2
@@ -10,3 +10,12 @@ instana_agent_operator:
   env:
     {{ INSTANA_AGENT_OPERATOR_ENV | indent }}
 {%- endif %}
+
+{%- if INSTANA_AGENT_OPERATOR_ARGOCD_PLUGIN_ENABLED is defined and INSTANA_AGENT_OPERATOR_ARGOCD_PLUGIN_ENABLED %}
+  argocd_plugin_enabled: true
+  argocd_insecure_skip_tls: {{ INSTANA_AGENT_OPERATOR_ARGOCD_INSECURE_SKIP_TLS }}
+  argocd_url: "{{ INSTANA_AGENT_OPERATOR_ARGOCD_URL }}"
+  argocd_clusters: {{ INSTANA_AGENT_OPERATOR_ARGOCD_CLUSTERS | toYaml }}
+  argocd_username: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_INSTANA_ARGOCD_USERNAME }}>"
+  argocd_password: "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_INSTANA_ARGOCD_PASSWORD }}>"
+{%- endif %}

From 65198db13a166f7994de2864b51fa257ae3d8793 Mon Sep 17 00:00:00 2001
From: Josef Harte <josefharte@Josefs-MacBook-Pro.local>
Date: Thu, 8 Oct 2026 14:33:37 +0100
Subject: [PATCH 2/2] update secrets

---
 image/cli/mascli/functions/gitops_cluster | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/image/cli/mascli/functions/gitops_cluster b/image/cli/mascli/functions/gitops_cluster
index 0e2d7e00777..2666d7119f2 100644
--- a/image/cli/mascli/functions/gitops_cluster
+++ b/image/cli/mascli/functions/gitops_cluster
@@ -648,6 +648,8 @@ function gitops_cluster() {
 
   export SECRET_NAME_INSTANA=${ACCOUNT_ID}${SM_DELIM}${CLUSTER_ID}${SM_DELIM}instana
   export SECRET_KEY_INSTANA_KEY=${SECRET_NAME_INSTANA}#key
+  export SECRET_KEY_INSTANA_ARGOCD_USERNAME=${SECRET_NAME_INSTANA}#argocd_username
+  export SECRET_KEY_INSTANA_ARGOCD_PASSWORD=${SECRET_NAME_INSTANA}#argocd_password
 
   export SECRET_NAME_SYSLOG_PULLSECRET=${ACCOUNT_ID}${SM_DELIM}syslog_pullsecret
   export SECRET_KEY_SYSLOG_PULLSECRET=${SECRET_NAME_SYSLOG_PULLSECRET}#pullsecret
@@ -687,6 +689,18 @@ function gitops_cluster() {
     sm_update_secret $SECRET_NAME_INSTANA "{\"key\": \"${INSTANA_KEY}\"}" "${TAGS}"
   fi
 
+  if [ -n "$INSTANA_ARGOCD_USERNAME" ]; then
+    echo "- Update INSTANA_ARGOCD_USERNAME secret"
+    TAGS="[{\"Key\": \"source\", \"Value\": \"gitops_cluster\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_ID}\"}]"
+    sm_update_secret $SECRET_NAME_INSTANA "{\"argocd_username\": \"${INSTANA_ARGOCD_USERNAME}\"}" "${TAGS}"
+  fi
+
+  if [ -n "$INSTANA_ARGOCD_PASSWORD" ]; then
+    echo "- Update INSTANA_ARGOCD_PASSWORD secret"
+    TAGS="[{\"Key\": \"source\", \"Value\": \"gitops_cluster\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_ID}\"}]"
+    sm_update_secret $SECRET_NAME_INSTANA "{\"argocd_password\": \"${INSTANA_ARGOCD_PASSWORD}\"}" "${TAGS}"
+  fi
+
   if [[ "$IMAGE_REPO_MIRROR" == "true" ]]; then
     sm_verify_secret_exists $SECRET_NAME_AWS_ECR "ecr_aws_access_key_id,ecr_aws_secret_access_key"
   fi