From 4a9be37d2b7a665ccd3d0269954c18a5342b018a Mon Sep 17 00:00:00 2001
From: zhangtao <111836083+sophon-zt@users.noreply.github.com>
Date: Fri, 20 Oct 2023 17:09:28 +0800
Subject: [PATCH] chore: add env SERVICE_PORT for collecting metrics by the
 oteld (#5527) (#5533)

(cherry picked from commit b96ed50d3dcf7ff90684a6aab6577515d9a4c721)
---
 deploy/apecloud-mysql/templates/clusterdefinition.yaml |  4 ++++
 deploy/mongodb/templates/clusterdefinition.yaml        |  2 ++
 deploy/postgresql/templates/clusterdefinition.yaml     |  2 ++
 deploy/pulsar/templates/clusterdefinition.yaml         | 10 ++++++++++
 deploy/redis/templates/clusterdefinition.yaml          |  8 ++++++++
 5 files changed, 26 insertions(+)

diff --git a/deploy/apecloud-mysql/templates/clusterdefinition.yaml b/deploy/apecloud-mysql/templates/clusterdefinition.yaml
index 51abf11fda9..3329dff0e2c 100644
--- a/deploy/apecloud-mysql/templates/clusterdefinition.yaml
+++ b/deploy/apecloud-mysql/templates/clusterdefinition.yaml
@@ -107,6 +107,8 @@ spec:
               - containerPort: 13306
                 name: paxos
             env:
+              - name: SERVICE_PORT
+                value: "3306"
               - name: MYSQL_ROOT_HOST
                 value: {{ .Values.auth.rootHost | default "%" | quote }}
               - name: MYSQL_ROOT_USER
@@ -235,6 +237,8 @@ spec:
                 value: "$(KB_CLUSTER_NAME)-vtcontroller-headless"
               - name: VTCTLD_WEB_PORT
                 value: "15000"
+              - name: SERVICE_PORT
+                value: "$(VTTABLET_PORT)"
               - name: MYSQL_ROOT_USER
                 valueFrom:
                   secretKeyRef:
diff --git a/deploy/mongodb/templates/clusterdefinition.yaml b/deploy/mongodb/templates/clusterdefinition.yaml
index 61838f56dfe..9bed09c8d91 100644
--- a/deploy/mongodb/templates/clusterdefinition.yaml
+++ b/deploy/mongodb/templates/clusterdefinition.yaml
@@ -96,6 +96,8 @@ spec:
             command:
               - /scripts/replicaset-setup.sh
             env:
+              - name: SERVICE_PORT
+                value: "27017"
               - name: MONGODB_ROOT_USER
                 valueFrom:
                   secretKeyRef:
diff --git a/deploy/postgresql/templates/clusterdefinition.yaml b/deploy/postgresql/templates/clusterdefinition.yaml
index 00db04bd3f1..7120dd1e826 100644
--- a/deploy/postgresql/templates/clusterdefinition.yaml
+++ b/deploy/postgresql/templates/clusterdefinition.yaml
@@ -158,6 +158,8 @@ spec:
               - name: patroni
                 containerPort: 8008
             env: ## refer https://github.com/zalando/spilo/blob/master/ENVIRONMENT.rst
+              - name: SERVICE_PORT
+                value: "5432"
               - name: DCS_ENABLE_KUBERNETES_API
                 value: "true"
               - name: KUBERNETES_USE_CONFIGMAPS
diff --git a/deploy/pulsar/templates/clusterdefinition.yaml b/deploy/pulsar/templates/clusterdefinition.yaml
index 32c4359a4f2..6c038cf6b81 100644
--- a/deploy/pulsar/templates/clusterdefinition.yaml
+++ b/deploy/pulsar/templates/clusterdefinition.yaml
@@ -148,6 +148,8 @@ spec:
             - name: PULSAR_LOG_LEVEL
               value: DEBUG
             {{- end }}
+            - name: SERVICE_PORT
+              value: "8080"
             - name: POD_NAME
               value: $(KB_POD_NAME)
             - name: PULSAR_PREFIX_brokerServicePort
@@ -340,6 +342,8 @@ spec:
             - name: PULSAR_LOG_LEVEL
               value: DEBUG
             {{- end }}
+            - name: SERVICE_PORT
+              value: "8080"
             - name: brokerWebServiceURL
               value: http://$(brokerSVC):80
             - name: brokerServiceURL
@@ -486,6 +490,8 @@ spec:
             - name: PULSAR_LOG_LEVEL
               value: DEBUG
             {{- end }}
+            - name: SERVICE_PORT
+              value: "8000"
             - name: cluster_domain
               value: {{ .Values.clusterDomain }}
             lifecycle:
@@ -653,6 +659,8 @@ spec:
             - name: PULSAR_LOG_LEVEL
               value: DEBUG
             {{- end }}
+            - name: SERVICE_PORT
+              value: "8000"
             - name: httpServerEnabled
               value: "true"
             - name: httpServerPort
@@ -755,6 +763,8 @@ spec:
               - name: PULSAR_LOG_LEVEL
                 value: DEBUG
               {{- end }}
+              - name: SERVICE_PORT
+                value: "8000"
               - name: EXTERNAL_PROVIDED_SERVERS
                 value: "false"
               - name: OPTS
diff --git a/deploy/redis/templates/clusterdefinition.yaml b/deploy/redis/templates/clusterdefinition.yaml
index 77c11d9fe06..b449399cd7a 100644
--- a/deploy/redis/templates/clusterdefinition.yaml
+++ b/deploy/redis/templates/clusterdefinition.yaml
@@ -74,6 +74,8 @@ spec:
               - name: pod-info
                 mountPath: /kb-podinfo
             env:
+              - name: SERVICE_PORT
+                value: "6379"
               - name: REDIS_REPL_USER
                 value: "kbreplicator"
               - name: REDIS_REPL_PASSWORD
@@ -82,6 +84,12 @@ spec:
                     name: $(CONN_CREDENTIAL_SECRET_NAME)
                     key: password
                     optional: false
+              - name: REDIS_DEFAULT_USER
+                valueFrom:
+                  secretKeyRef:
+                    name: $(CONN_CREDENTIAL_SECRET_NAME)
+                    key: username
+                    optional: false
               - name: REDIS_DEFAULT_PASSWORD
                 valueFrom:
                   secretKeyRef: