This is an automated email from the ASF dual-hosted git repository.

zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ba634f8 [charts] admin to template and tpl (#470)
9ba634f8 is described below

commit 9ba634f885a3e31fcb52cb40d25a8c7fc5055b34
Author: mfordjody <[email protected]>
AuthorDate: Thu Oct 17 09:02:24 2024 +0800

    [charts] admin to template and tpl (#470)
---
 manifests/charts/admin/Chart.lock                  |  21 ----
 .../admin/templates/admin/admin-deployment.yaml    |  14 ++-
 .../admin/templates/admin/admin-statefulset.yaml   |  14 ++-
 manifests/charts/admin/templates/jobs.yaml         | 108 +++++++++------------
 .../admin/templates/modular/_annotations.tpl       |  35 +++++++
 .../charts/admin/templates/modular/_labels.tpl     |   4 +-
 .../charts/admin/templates/modular/_names.tpl      |  30 +++---
 .../charts/admin/templates/modular/_namespaces.tpl |   7 ++
 .../observable/exporters/_servicemonitor.yaml      |  32 ------
 .../admin/templates/traffic/traffic-authority.yaml |   6 +-
 .../admin/templates/traffic/traffic-config.yaml    |   6 +-
 .../admin/templates/traffic/traffic-rbac.yaml      |  10 +-
 manifests/charts/admin/values.yaml                 |  19 +++-
 13 files changed, 143 insertions(+), 163 deletions(-)

diff --git a/manifests/charts/admin/Chart.lock 
b/manifests/charts/admin/Chart.lock
deleted file mode 100644
index 09bd39c9..00000000
--- a/manifests/charts/admin/Chart.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-dependencies:
-- name: zookeeper
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.5.1
-digest: sha256:d75813cf29fb20f5459c3943ddd7938f244aca7fb6cca1fe76a66d4546d0bcaa
-generated: "2024-01-20T16:01:36.129586213Z"
diff --git a/manifests/charts/admin/templates/admin/admin-deployment.yaml 
b/manifests/charts/admin/templates/admin/admin-deployment.yaml
index 7cc0756f..29c61c24 100644
--- a/manifests/charts/admin/templates/admin/admin-deployment.yaml
+++ b/manifests/charts/admin/templates/admin/admin-deployment.yaml
@@ -2,7 +2,7 @@
 {{- $cp := .Values.cp -}}
 {{- $zoo := .Values.zookeeper -}}
 {{- $nacos := .Values.nacos -}}
-{{- $observable := $admin.observable -}}
+{{- $prom := .Values.kubePrometheus }}
 {{- if eq $admin.deployType "Deployment" }}
 apiVersion: {{ template "apiVersion" . }}
 kind: Deployment
@@ -93,15 +93,13 @@ spec:
         {{- end }}
         - name: DUBBO_RUNTIME_KUBERNETES_ADMISSION_SERVER_CERT_DIR
           value: /var/run/secrets/dubbo.io/tls-cert
-        {{- $promName := include "prom.name" . -}}
-        {{- $promPort := include "prom.port" . -}}
-        {{- if $observable.enabled }}
+        {{- $promName := include "prom.name" . }}
+        {{- $promPort := include "prom.port" . }}
+        {{- if $prom.enabled }}
         - name: ADMIN_PROMETHEUS_ADDRESS
           value: {{ $promName }}:{{ $promPort }}
-        {{- end }}
-        {{- $grafanaName := include "grafana.name" . -}}
-        {{- $grafanaPort := include "grafana.port" . -}}
-        {{- if $observable.enabled }}
+        {{- $grafanaName := include "grafana.name" . }}
+        {{- $grafanaPort := include "grafana.port" . }}
         - name: ADMIN_GRAFANA_ADDRESS
           value: {{ $grafanaName }}:{{ $grafanaPort }}
         {{- end }}
diff --git a/manifests/charts/admin/templates/admin/admin-statefulset.yaml 
b/manifests/charts/admin/templates/admin/admin-statefulset.yaml
index beb38c1d..a766afe0 100644
--- a/manifests/charts/admin/templates/admin/admin-statefulset.yaml
+++ b/manifests/charts/admin/templates/admin/admin-statefulset.yaml
@@ -2,7 +2,7 @@
 {{- $cp := .Values.cp -}}
 {{- $zoo := .Values.zookeeper -}}
 {{- $nacos := .Values.nacos -}}
-{{- $observable := $admin.observable -}}
+{{- $prom := .Values.kubePrometheus }}
 {{- if eq $admin.deployType "StatefulSet" }}
 apiVersion: {{ template "apiVersion" . }}
 kind: StatefulSet
@@ -88,15 +88,13 @@ spec:
         - name: ADMIN_REGISTRY_ADDRESS
           value: zookeeper://{{ range $k, $v := until $zooReplicas }}{{ 
$zooName }}-{{ $v }}.{{ $zooName }}.{{ $zooNamespace }}.svc.{{ $clusterDomain 
}}:{{ $zooPort }} {{ end }}
         {{- end }}
-        {{- $promName := include "prom.name" . -}}
-        {{- $promPort := include "prom.port" . -}}
-        {{- if $observable.enabled }}
+        {{- $promName := include "prom.name" . }}
+        {{- $promPort := include "prom.port" . }}
+        {{- if $prom.enabled }}
         - name: ADMIN_PROMETHEUS_ADDRESS
           value: {{ $promName }}:{{ $promPort }}
-        {{- end }}
-        {{- $grafanaName := include "grafana.name" . -}}
-        {{- $grafanaPort := include "grafana.port" . -}}
-        {{- if $observable.enabled }}
+        {{- $grafanaName := include "grafana.name" . }}
+        {{- $grafanaPort := include "grafana.port" . }}
         - name: ADMIN_GRAFANA_ADDRESS
           value: {{ $grafanaName }}:{{ $grafanaPort }}
         {{- end }}
diff --git a/manifests/charts/admin/templates/jobs.yaml 
b/manifests/charts/admin/templates/jobs.yaml
index ff0a0b96..cbbf45fc 100644
--- a/manifests/charts/admin/templates/jobs.yaml
+++ b/manifests/charts/admin/templates/jobs.yaml
@@ -1,17 +1,14 @@
+{{- $prom := .Values.kubePrometheus }}
 {{- $jobs := .Values.jobs -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: jobs-env
-  namespace: default
+  namespace: {{ template "admin.namespace" . }}
   labels:
-    app.kubernetes.io/name: jobs
-    helm.sh/chart: jobs-1.28.4
-    app.kubernetes.io/managed-by: Helm
+  {{- include "jobs.labels" . | nindent 4 }}
   annotations:
-    "helm.sh/hook": "pre-install"
-    "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+  {{- include "jobs.env.annotations" . | nindent 4 }}
 data:
   kubectl.sh: |-
     #!/bin/bash
@@ -31,28 +28,29 @@ data:
     #!/bin/bash
 
     set -eux
+    ISTIO="https://istio-release.storage.googleapis.com/charts";
 
+    {{- if $prom.enabled }}
     PROMETHEUS="https://prometheus-community.github.io/helm-charts";
-    ISTIO="https://istio-release.storage.googleapis.com/charts";
 
-    helm pull kube-prometheus-stack --repo "$PROMETHEUS" --version 65.2.0 
--untar && rm -rf kube-prometheus-stack-65.2.0.tgz/ \
+    helm pull {{ include "prom.name" . }} --repo "$PROMETHEUS" --version {{ 
$prom.image.tag }} --untar && rm -rf {{ include "prom.name" . }}-{{ 
$prom.image.tag }}.tgz/ \
     for i in {1..5}; do
-      if rm -rf kube-prometheus-stack-65.2.0.tgz/; then
+      if rm -rf {{ include "prom.name" . }}-{{ $prom.image.tag }}.tgz/; then
       break
       else
     echo "Attempt $i: Failed to remove directory, retrying in 2 seconds..."
       sleep 2
       fi
       done
-    cp -r "/files/dashboards/" 
kube-prometheus-stack/templates/grafana/dashboards-1.14 && \
-    ls -la kube-prometheus-stack/templates/grafana/dashboards-1.14 && \
+    cp -r "/files/dashboards/" {{ include "prom.name" . }}/templates/{{ 
include "grafana.name" . }}/dashboards-{{ $prom.dashboardsVersion }} && \
+    ls -la {{ include "prom.name" . }}/templates/{{ include "grafana.name" . 
}}/dashboards-{{ $prom.dashboardsVersion }} && \
 
-    if helm ls --all | grep -q "kube-prometheus"; then
-    helm upgrade kube-prometheus ./kube-prometheus-stack/
+    if helm ls --all | grep -q {{ include "prom.name" . }}; then
+    helm upgrade kube-prometheus ./{{ include "prom.name" . }}/
     else
-    helm install kube-prometheus ./kube-prometheus-stack/
+    helm install kube-prometheus ./{{ include "prom.name" . }}/
     fi
-
+    {{- end }}
     helm repo add istio "$ISTIO" && \
     helm repo update && \
     helm install istio-base istio/base -n istio-system --set 
defaultRevision=default && \
@@ -64,23 +62,19 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: jobs-1
-  namespace: default
+  name: dubbo-application-create-1
+  namespace: {{ template "admin.namespace" . }}
   labels:
-    app.kubernetes.io/name: jobs
-    helm.sh/chart: jobs-1.28.4
-    app.kubernetes.io/managed-by: Helm
+  {{- include "jobs.labels" . | nindent 4 }}
   annotations:
-    "helm.sh/hook": "pre-install"
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": "hook-succeeded"
+  {{- include "jobs.1.annotations" . | nindent 4 }}
 spec:
   template:
     metadata:
-      name: jobs-1
+      name: dubbo-application-create-1
     spec:
       serviceAccountName: helm-job-sa
-      restartPolicy: OnFailure
+      restartPolicy: {{ $jobs.restartPolicy }}
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
@@ -111,44 +105,40 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: jobs-2
-  namespace: default
+  name: dubbo-application-create-2
+  namespace: {{ template "admin.namespace" . }}
   labels:
-    app.kubernetes.io/name: jobs
-    helm.sh/chart: jobs-1.28.4
-    app.kubernetes.io/managed-by: Helm
+  {{- include "jobs.labels" . | nindent 4 }}
   annotations:
-    "helm.sh/hook": "pre-install"
-    "helm.sh/hook-weight": "2"
-    "helm.sh/hook-delete-policy": "hook-succeeded"
+  {{- include "jobs.2.annotations" . | nindent 4 }}
 spec:
   template:
     metadata:
-      name: jobs-2
+      name: dubbo-application-create-2
     spec:
-      serviceAccountName: helm-job-sa
-      restartPolicy: OnFailure
+      serviceAccountName: job-sa
+      restartPolicy: {{ $jobs.restartPolicy }}
       dnsPolicy: "None"
       dnsConfig:
         nameservers:
-          - 8.8.8.8
+        - 8.8.8.8
         searches:
-          - default.svc.cluster.local
+        - default.svc.cluster.local
       containers:
-        - name: helm
-          image: alpine/helm:3.16.2
-          imagePullPolicy: IfNotPresent
-          command:
-            - "/bin/sh"
-            - "-c"
-            - "sh /files/helm.sh"
-          volumeMounts:
-          - name: scripts
-            mountPath: /files/helm.sh
-            subPath: helm.sh
-          - name: scripts
-            mountPath: /files/dashboards/dubbo-resources-metrics.yaml
-            subPath: dubbo-resources-metrics.yaml
+      - name: helm
+        image: alpine/helm:3.16.2
+        imagePullPolicy: IfNotPresent
+        command:
+          - "/bin/sh"
+          - "-c"
+          - "sh /files/helm.sh"
+        volumeMounts:
+        - name: scripts
+          mountPath: /files/helm.sh
+          subPath: helm.sh
+        - name: scripts
+          mountPath: /files/dashboards/dubbo-resources-metrics.yaml
+          subPath: dubbo-resources-metrics.yaml
       volumes:
       - name: scripts
         configMap:
@@ -158,19 +148,17 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: helm-job-sa
-  namespace: default
+  name: job-sa
+  namespace: {{ template "admin.namespace" . }}
   annotations:
-    "helm.sh/hook": "pre-install"
-    "helm.sh/hook-delete-policy": "before-hook-creation"
+  {{- include "jobs.sa.annotations" . | nindent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: helm-job-sa-binding
   annotations:
-    "helm.sh/hook": "pre-install"
-    "helm.sh/hook-delete-policy": "before-hook-creation"
+  {{- include "jobs.sa.annotations" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -178,4 +166,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: helm-job-sa
-  namespace: default
\ No newline at end of file
+  namespace: {{ template "admin.namespace" . }}
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/modular/_annotations.tpl 
b/manifests/charts/admin/templates/modular/_annotations.tpl
new file mode 100644
index 00000000..d6e6c085
--- /dev/null
+++ b/manifests/charts/admin/templates/modular/_annotations.tpl
@@ -0,0 +1,35 @@
+{{/*
+Return jobs env annotations to use.
+*/}}
+{{- define "jobs.env.annotations" -}}
+"helm.sh/hook": "pre-install"
+"helm.sh/hook-weight": "0"
+"helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
+{{- end -}}
+
+
+{{/*
+Return jobs-1 annotations to use.
+*/}}
+{{- define "jobs.1.annotations" -}}
+"helm.sh/hook": "pre-install"
+"helm.sh/hook-weight": "1"
+"helm.sh/hook-delete-policy": "hook-succeeded"
+{{- end -}}
+
+{{/*
+Return jobs-2 annotations to use.
+*/}}
+{{- define "jobs.2.annotations" -}}
+"helm.sh/hook": "pre-install"
+"helm.sh/hook-weight": "2"
+"helm.sh/hook-delete-policy": "hook-succeeded"
+{{- end -}}
+
+{{/*
+Return jobs serviceAccount annotations to use.
+*/}}
+{{- define "jobs.sa.annotations" -}}
+"helm.sh/hook": "pre-install"
+"helm.sh/hook-delete-policy": "before-hook-creation"
+{{- end -}}
diff --git a/manifests/charts/admin/templates/modular/_labels.tpl 
b/manifests/charts/admin/templates/modular/_labels.tpl
index a3ae8842..0a70f49c 100644
--- a/manifests/charts/admin/templates/modular/_labels.tpl
+++ b/manifests/charts/admin/templates/modular/_labels.tpl
@@ -34,9 +34,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 
 {{/*
-Return Job Labels to use.
+Return Jobs Labels to use.
 */}}
-{{- define "job.labels" -}}
+{{- define "jobs.labels" -}}
 app.kubernetes.io/name: {{ template "job.name" . }}
 helm.sh/chart: {{ include "job.name" . }}-{{ .Values.jobs.image.tag }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/manifests/charts/admin/templates/modular/_names.tpl 
b/manifests/charts/admin/templates/modular/_names.tpl
index e06f053c..4f4070af 100644
--- a/manifests/charts/admin/templates/modular/_names.tpl
+++ b/manifests/charts/admin/templates/modular/_names.tpl
@@ -1,14 +1,7 @@
 {{/*
-Return Job Name to use.
+Return Dubbo Control Plane Name to use.
 */}}
-{{- define "job.name" -}}
-{{- printf "jobs" -}}
-{{- end -}}
-
-{{/*
-Return Admin Control Plane Name to use.
-*/}}
-{{- define "cp.name" -}}
+{{- define "dubbo.cp.name" -}}
 {{- printf "admin-cp" -}}
 {{- end -}}
 
@@ -19,14 +12,6 @@ Return Admin Name to use.
 {{- printf "admin" -}}
 {{- end -}}
 
-{{/*
-Return Dubbo Namespace to use.
-*/}}
-{{- define "admin.namespace" -}}
-{{- "dubbo-system" | default }}
-{{- end }}
-
-
 {{/*
 Return ZooKeeper Name to use.
 */}}
@@ -49,10 +34,10 @@ Return Traefik Name to use.
 {{- end -}}
 
 {{/*
-Return Prometheus Name to use.
+Return Kube-Prometheus Name to use.
 */}}
 {{- define "prom.name" -}}
-{{- printf "prometheus-cp-server" -}}
+{{- printf "kube-prometheus-stack" -}}
 {{- end -}}
 
 {{/*
@@ -61,3 +46,10 @@ Return Grafana Name to use.
 {{- define "grafana.name" -}}
 {{- printf "grafana" -}}
 {{- end -}}
+
+{{/*
+Return Job Name to use.
+*/}}
+{{- define "job.name" -}}
+{{- printf "jobs" -}}
+{{- end -}}
diff --git a/manifests/charts/admin/templates/modular/_namespaces.tpl 
b/manifests/charts/admin/templates/modular/_namespaces.tpl
index 28f884b0..02cc2eb9 100644
--- a/manifests/charts/admin/templates/modular/_namespaces.tpl
+++ b/manifests/charts/admin/templates/modular/_namespaces.tpl
@@ -1,3 +1,10 @@
+{{/*
+Return Dubbo Namespace to use.
+*/}}
+{{- define "admin.namespace" -}}
+{{- "dubbo-system" | default }}
+{{- end }}
+
 {{/*
 Return ZooKeeper Namespace to use.
 */}}
diff --git 
a/manifests/charts/admin/templates/observable/exporters/_servicemonitor.yaml 
b/manifests/charts/admin/templates/observable/exporters/_servicemonitor.yaml
deleted file mode 100644
index a5140b3d..00000000
--- a/manifests/charts/admin/templates/observable/exporters/_servicemonitor.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ template "admin.name" . }}
-  namespace: {{ template "admin.namespace" . }}
-spec:
-  endpoints:
-    - interval: 15s
-      port: admin-http
-      scheme: http
-  jobLabel: app.kubernetes.io/name
-  namespaceSelector:
-    matchNames:
-      - dubbo-system
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ template "admin.name" . }}
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/traffic/traffic-authority.yaml 
b/manifests/charts/admin/templates/traffic/traffic-authority.yaml
index fb4e6667..f5304920 100644
--- a/manifests/charts/admin/templates/traffic/traffic-authority.yaml
+++ b/manifests/charts/admin/templates/traffic/traffic-authority.yaml
@@ -3,7 +3,7 @@
 apiVersion: dubbo.io/v1alpha1
 kind: AuthenticationPolicy
 metadata:
-  name: {{ template "cp.name" . }}-authentication
+  name: {{ template "dubbo.cp.nam" . }}-authentication
   namespace: {{ template "admin.namespace" . }}
 spec:
   action: {{ $authc.action }}
@@ -15,14 +15,14 @@ spec:
 apiVersion: dubbo.io/v1alpha1
 kind: AuthorizationPolicy
 metadata:
-  name: {{ template "cp.name" . }}-authorization
+  name: {{ template "dubbo.cp.name" . }}-authorization
   namespace: {{ template "admin.namespace" . }}
 spec:
   action: {{ $authz.action }}
   matchType: {{ $authz.matchType }}
   rules:
   - from:
-      namespaces: ["dubbo-system"]
+      namespaces: [{{ template "admin.namespace" . }}]
   samples: {{ $authz.samples }}
 {{- end }}
 
diff --git a/manifests/charts/admin/templates/traffic/traffic-config.yaml 
b/manifests/charts/admin/templates/traffic/traffic-config.yaml
index 1c1dd9a4..e1f6c7b5 100644
--- a/manifests/charts/admin/templates/traffic/traffic-config.yaml
+++ b/manifests/charts/admin/templates/traffic/traffic-config.yaml
@@ -2,7 +2,7 @@
 apiVersion: dubbo.io/v1alpha1
 kind: ConditionRoute
 metadata:
-  name: {{ template "cp.name" . }}-conditionroute
+  name: {{ template "dubbo.cp.name" . }}-conditionroute
   namespace: {{ template "admin.namespace" . }}
 spec:
   enabled: {{ $cr.enabled }}
@@ -18,7 +18,7 @@ spec:
 apiVersion: dubbo.io/v1alpha1
 kind: DynamicConfig
 metadata:
-  name: {{ template "cp.name" . }}-dynamicconfig
+  name: {{ template "dubbo.cp.name" . }}-dynamicconfig
   namespace: {{ template "admin.namespace" . }}
 spec:
   configVersion: {{ $dc.configVersion }}
@@ -34,7 +34,7 @@ spec:
 apiVersion: dubbo.io/v1alpha1
 kind: TagRoute
 metadata:
-  name: {{ template "cp.name" . }}-tagroute
+  name: {{ template "dubbo.cp.name" . }}-tagroute
   namespace: {{ template "admin.namespace" . }}
 spec:
   configVersion: {{ $tr.configVersion }}
diff --git a/manifests/charts/admin/templates/traffic/traffic-rbac.yaml 
b/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
index 0924170e..4bc3114e 100644
--- a/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
+++ b/manifests/charts/admin/templates/traffic/traffic-rbac.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "cp.name" . }}-sa
+  name: {{ template "dubbo.cp.name" . }}-sa
   namespace: {{ template "admin.namespace" . }}
 ---
 apiVersion: {{ include "rbac.apiVersion" . }}
 kind: ClusterRole
 metadata:
-  name: {{ include "cp.name" . }}-clusterrole
+  name: {{ include "dubbo.cp.name" . }}-clusterrole
 rules:
   - apiGroups:
       - ""
@@ -19,12 +19,12 @@ rules:
 apiVersion: {{ include "rbac.apiVersion" . }}
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "cp.name" . }}-clusterrolebinding
+  name: {{ include "dubbo.cp.name" . }}-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "cp.name" . }}-clusterrole
+  name: {{ include "dubbo.cp.name" . }}-clusterrole
 subjects:
   - kind: ServiceAccount
-    name: {{ template "cp.name" . }}-sa
+    name: {{ template "dubbo.cp.name" . }}-sa
     namespace: {{ template "admin.namespace" . }}
\ No newline at end of file
diff --git a/manifests/charts/admin/values.yaml 
b/manifests/charts/admin/values.yaml
index a3ffd8ab..b9368d31 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -315,6 +315,8 @@ jobs:
     # Image pull policy, available options are: Always, IfNotPresent, Never.
     pullPolicy: IfNotPresent
 
+
+
 ## TODO
 cp:
  mode: universal
@@ -391,6 +393,7 @@ auth:
     # Specify the action for authentication port number for applying the 
authentication policy
     port: 38080
 
+
 traffic:
   ## Whether to enable the traffic.
   enabled: false
@@ -448,10 +451,22 @@ traffic:
     # The identifier of the target application that this rule is about to 
control.
     key: details
 
-observable:
-  ## Whether to enable the observability.
+kubePrometheus:
+  ## Whether to enable the kube-prometheus.
   enabled: true
+  ## Override the namespace where the resource is deployed.
+  namespaceOverride: ~
 
+  ## container image.
+  image:
+    # Version tag of the container image.
+    tag: 65.2.0
+
+  dashboardsVersion: 1.14
+
+jaeger:
+  ## Whether to enable the jaeger.
+  enabled: false
 
 zookeeper:
   ## Whether to enable the zookeeper.

Reply via email to