[minor] Install Instana Agent Operator for GitOps

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-01-23T11:46:57Z",
+  "generated_at": "2025-01-23T12:00:32Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -172,7 +172,7 @@
         "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 403,
+        "line_number": 411,
         "type": "Secret Keyword",
         "verified_result": null
       }

image/cli/mascli/functions/gitops_cluster

@@ -87,6 +87,9 @@ CrowdStrike Falcon Operator (Optional):
 Cluster Logging Operator (Optional):
       --install-cluster-logging-operator ${COLOR_YELLOW}CLUSTER_LOGGING_OPERATOR_INSTALL${TEXT_RESET}           Install the Cluster Logging Operator
 
+Instana Agent Operator (Optional):
+      --install-instana-agent-operator ${COLOR_YELLOW}INSTANA_AGENT_OPERATOR_INSTALL${TEXT_RESET}               Install the Instana Agent Operator
+
 Other Commands:
   -h, --help                              Show this help message
 EOM
@@ -284,6 +287,11 @@ function gitops_cluster_noninteractive() {
         export CLUSTER_LOGGING_OPERATOR_INSTALL=true
         ;;
 
+      # Instana Agent Operator
+      --install-instana-agent-operator)
+        export INSTANA_AGENT_OPERATOR_INSTALL=true
+        ;;
+
       # Other Commands
       -h|--help)
         gitops_cluster_help
@@ -481,6 +489,11 @@ function gitops_cluster() {
   echo_reset_dim "Use Syslog Forwarder ........... ${COLOR_MAGENTA}${CLUSTER_LOGGING_OPERATOR_USE_SYSLOG_FORWARDER}"
   reset_colors
 
+  echo "${TEXT_DIM}"
+  echo_h2 "Instana Agent Operator" "    "
+  echo_reset_dim "Install the Instana Agent Operator ........... ${COLOR_MAGENTA}${INSTANA_AGENT_OPERATOR_INSTALL}"
+  reset_colors
+
   # Set up secrets
   # ---------------------------------------------------------------------------
   echo
@@ -509,6 +522,9 @@ function gitops_cluster() {
   export SECRET_KEY_CLOUDWATCH_AWS_SECRET_ACCESS_KEY=${SECRET_NAME_CLOUDWATCH}#aws_secret_access_key
   export SECRET_KEY_CLOUDWATCH_AWS_ACCESS_KEY_ID=${SECRET_NAME_CLOUDWATCH}#aws_access_key_id
 
+  export SECRET_NAME_INSTANA=${ACCOUNT_ID}${SM_DELIM}${CLUSTER_ID}${SM_DELIM}instana
+  export SECRET_KEY_INSTANA_KEY=${SECRET_NAME_INSTANA}#key
+
   if [ -n "$DEVOPS_MONGO_URI" ];then
     echo "- Update DEVOPS_MONGO_URI secret"
     TAGS="[{\"Key\": \"source\", \"Value\": \"gitops_cluster\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_ID}\"}]"
@@ -533,6 +549,12 @@ function gitops_cluster() {
     sm_update_secret $SECRET_NAME_CLOUDWATCH "{\"aws_secret_access_key\": \"${CLOUDWATCH_AWS_SECRET_ACCESS_KEY}\", \"aws_access_key_id\": \"${CLOUDWATCH_AWS_ACCESS_KEY_ID}\"}" "${TAGS}"
   fi
 
+  if [ -n "$INSTANA_KEY" ]; then
+    echo "- Update INSTANA_KEY secret"
+    TAGS="[{\"Key\": \"source\", \"Value\": \"gitops_cluster\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_ID}\"}]"
+    sm_update_secret $SECRET_NAME_INSTANA "{\"key\": \"${INSTANA_KEY}\"}" "${TAGS}"
+  fi
+
   if [ -z $GIT_SSH ]; then
     export GIT_SSH="false"
   fi
@@ -651,6 +673,12 @@ function gitops_cluster() {
     jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/cluster-logging-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/cluster-logging-operator.yaml
   fi
 
+  if [[ -n "$INSTANA_AGENT_OPERATOR_INSTALL" ]]; then
+    echo "- Instana Agent Operator"
+    sm_verify_secret_exists $SECRET_NAME_INSTANA "key"
+    jinja -X .+ $CLI_DIR/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2 -o ${GITOPS_CLUSTER_DIR}/instana-agent-operator.yaml
+  fi
+
   # Commit and push to github target repo
   # ---------------------------------------------------------------------------
   if [ "$GITHUB_PUSH" == "true" ]; then

image/cli/mascli/templates/gitops/appset-configs/cluster/instana-agent-operator.yaml.j2

@@ -0,0 +1,12 @@
+merge-key: "{{ ACCOUNT_ID }}/{{ CLUSTER_ID }}"
+
+instana_agent_operator:
+  install: "{{ INSTANA_AGENT_OPERATOR_INSTALL }}"
+  jks_storage_class: "{{ INSTANA_AGENT_OPERATOR_JKS_STORAGE_CLASS }}"
+  key:  "<path:{{ SECRETS_PATH }}:{{ SECRET_KEY_INSTANA_KEY }}>"
+  endpoint_host: "{{ INSTANA_AGENT_OPERATOR_ENDPOINT_HOST }}"
+  endpoint_port: "{{ INSTANA_AGENT_OPERATOR_ENDPOINT_PORT }}"
+{%- if INSTANA_AGENT_OPERATOR_ENV is defined and INSTANA_AGENT_OPERATOR_ENV %}
+  env:
+    {{ INSTANA_AGENT_OPERATOR_ENV | indent }}
+{%- endif %}

tekton/src/pipelines/gitops/gitops-mas-cluster.yml.j2

@@ -178,6 +178,22 @@ spec:
       type: string
       default: 'true'
 
+    - name: instana_agent_operator_install
+      type: string
+      default: 'false'
+    - name: instana_agent_operator_endpoint_host
+      type: string
+      default: ''
+    - name: instana_agent_operator_endpoint_port
+      type: string
+      default: ''
+    - name: instana_agent_operator_env
+      type: string
+      default: ''
+    - name: instana_agent_operator_jks_storage_class
+      type: string
+      default: ''
+
   tasks:
     - name: gitops-cluster
       params:
@@ -270,6 +286,17 @@ spec:
           value: $(params.cluster_logging_operator_install)
         - name: cluster_logging_operator_use_syslog_forwarder
           value: $(params.cluster_logging_operator_use_syslog_forwarder)
+
+        - name: instana_agent_operator_install
+          value: $(params.instana_agent_operator_install)
+        - name: instana_agent_operator_endpoint_host
+          value: $(params.instana_agent_operator_endpoint_host)
+        - name: instana_agent_operator_endpoint_port
+          value: $(params.instana_agent_operator_endpoint_port)
+        - name: instana_agent_operator_env
+          value: $(params.instana_agent_operator_env)
+        - name: instana_agent_operator_env
+          value: $(params.instana_agent_operator_jks_storage_class)
 
       taskRef:
         kind: Task

tekton/src/tasks/gitops/gitops-cluster.yml.j2

@@ -117,6 +117,22 @@ spec:
       type: string
       default: 'true'
 
+    - name: instana_agent_operator_install
+      type: string
+      default: 'false'
+    - name: instana_agent_operator_endpoint_host
+      type: string
+      default: ''
+    - name: instana_agent_operator_endpoint_port
+      type: string
+      default: ''
+    - name: instana_agent_operator_env
+      type: string
+      default: ''
+    - name: instana_agent_operator_jks_storage_class
+      type: string
+      default: ''
+
   stepTemplate:
     name: gitops-cluster
     env:
@@ -207,6 +223,17 @@ spec:
       - name: CLUSTER_LOGGING_OPERATOR_USE_SYSLOG_FORWARDER
         value: $(params.cluster_logging_operator_use_syslog_forwarder)
 
+      - name: INSTANA_AGENT_OPERATOR_INSTALL
+        value: $(params.instana_agent_operator_install)
+      - name: INSTANA_AGENT_OPERATOR_ENDPOINT_HOST
+        value: $(params.instana_agent_operator_endpoint_host)
+      - name: INSTANA_AGENT_OPERATOR_ENDPOINT_PORT
+        value: $(params.instana_agent_operator_endpoint_port)
+      - name: INSTANA_AGENT_OPERATOR_ENV
+        value: $(params.instana_agent_operator_env)
+      - name: INSTANA_AGENT_OPERATOR_JKS_STORAGE_CLASS
+        value: $(params.instana_agent_operator_jks_storage_class)
+
     envFrom:
       - configMapRef:
           name: environment-properties