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 d3f31d2e [charts] Refactoring admin configuration (#658)
d3f31d2e is described below
commit d3f31d2e2f6e746f0d061dd94dfc77dc68fd43ad
Author: Jian Zhong <[email protected]>
AuthorDate: Mon Mar 24 12:04:26 2025 +0800
[charts] Refactoring admin configuration (#658)
---
.../charts/admin/templates/job.yaml => job.yaml | 0
manifests/charts/admin/templates/NOTES.txt | 34 --
manifests/charts/admin/templates/_helpers.tpl | 261 ------------
manifests/charts/admin/templates/certificates.yaml | 50 ---
manifests/charts/admin/templates/configmap.yaml | 58 ---
manifests/charts/admin/templates/deployment.yaml | 166 ++------
.../admin/templates/persistentvolumeclaim.yaml | 31 --
manifests/charts/admin/templates/rbac.yaml | 130 ++----
manifests/charts/admin/templates/service.yaml | 96 +----
manifests/charts/admin/templates/zzz_profile.yaml | 1 +
manifests/charts/admin/values.yaml | 473 ++-------------------
manifests/charts/base/templates/NOTES.txt | 1 +
manifests/charts/base/templates/zzz_profile.yaml | 1 +
.../register-discovery/nacos/templates/NOTES.txt | 1 +
.../zookeeper/templates/NOTES.txt | 1 +
.../zookeeper/templates/zzz_profile.yaml | 1 +
.../templates/traffic => traffic}/authority.yaml | 0
.../templates/traffic => traffic}/config.yaml | 0
.../admin/templates/traffic => traffic}/rbac.yaml | 0
19 files changed, 132 insertions(+), 1173 deletions(-)
diff --git a/manifests/charts/admin/templates/job.yaml b/job.yaml
similarity index 100%
rename from manifests/charts/admin/templates/job.yaml
rename to job.yaml
diff --git a/manifests/charts/admin/templates/NOTES.txt
b/manifests/charts/admin/templates/NOTES.txt
index 05278f83..b5ff8dc3 100644
--- a/manifests/charts/admin/templates/NOTES.txt
+++ b/manifests/charts/admin/templates/NOTES.txt
@@ -1,35 +1 @@
-⏳ Please wait for all the activated components to be deployed.
-
-Dashboard: Admin
-Version: {{ .Values.image.tag }}
-
-{{- if .Values.ingress.enabled }}
-
-Exposer: ✅️
-
-So you should be able to access the website at the following URL:
-
-1. http://{{ .Values.ingress.hosts.admin }}
-2. http://{{ .Values.ingress.hosts.prometheus }}
-3. http://{{ .Values.ingress.hosts.grafana }}
-
-🎊 You have enabled the internal entrance controller.
-
-{{- else }}
-
-Exposer: ❎
-
-🚫 You have disabled the internal entrance controller.
-
-{{- end }}
-
-{{- if not .Values.persistence.enabled }}
-
- #########################################################
- # ⚠ Not enabled for persistent storage. #
- # If you have important data, please enable it. #
- #########################################################
-
-{{- end }}
-
🌹 For more details, please visit https://dubbo.apache.org.
diff --git a/manifests/charts/admin/templates/_helpers.tpl
b/manifests/charts/admin/templates/_helpers.tpl
index 85373392..139597f9 100644
--- a/manifests/charts/admin/templates/_helpers.tpl
+++ b/manifests/charts/admin/templates/_helpers.tpl
@@ -1,263 +1,2 @@
-{{/*
-Return Dubbo Control Plane Name to use.
-*/}}
-{{- define "dubbo.cp.name" -}}
-{{- printf "admin-cp" -}}
-{{- end -}}
-{{/*
-Return Admin Name to use.
-*/}}
-{{- define "admin.name" -}}
-{{- printf "admin" -}}
-{{- end -}}
-
-{{/*
-Return ZooKeeper Name to use.
-*/}}
-{{- define "zoo.name" -}}
-{{- printf "zookeeper" -}}
-{{- end -}}
-
-{{/*
-Return Nacos Name to use.
-*/}}
-{{- define "nacos.name" -}}
-{{- printf "nacos" -}}
-{{- end -}}
-
-{{/*
-Return Traefik Name to use.
-*/}}
-{{- define "traefik.name" -}}
-{{- printf "traefik" -}}
-{{- end -}}
-
-{{/*
-Return Kube-Prometheus-Stack Name to use.
-*/}}
-{{- define "prom.stack.name" -}}
-{{- printf "kube-prometheus-stack" -}}
-{{- end -}}
-
-{{/*
-Return Kube-Prometheus-Stack Name to use.
-*/}}
-{{- define "prom.name" -}}
-{{- printf "kube-prometheus" -}}
-{{- end -}}
-
-{{/*
-Return kube-prometheus-grafana to use.
-*/}}
-{{- define "grafana.stack.name" -}}
-{{- printf "kube-prometheus-grafana" -}}
-{{- end -}}
-
-{{/*
-Return Grafana Name to use.
-*/}}
-{{- define "grafana.name" -}}
-{{- printf "grafana" -}}
-{{- end -}}
-
-{{/*
-Return Job Name to use.
-*/}}
-{{- define "job.name" -}}
-{{- printf "jobs" -}}
-{{- end -}}
-
-{{/*
-Return Dubbo Namespace to use.
-*/}}
-{{- define "admin.namespace" -}}
-{{- "dubbo-system" | default }}
-{{- end }}
-
-{{/*
-Return Jobs Namespace to use.
-*/}}
-{{- define "job.namespace" -}}
-{{- if .Values.jobs.namespaceOverride -}}
-{{- .Values.jobs.namespaceOverride }}
-{{- else -}}
-{{- .Release.Namespace }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return ingress Namespace to use.
-*/}}
-{{- define "ingress.namespace" -}}
-{{- if .Values.ingress.namespaceOverride -}}
-{{- .Values.ingress.namespaceOverride }}
-{{- else -}}
-{{- .Release.Namespace }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return Admin Labels to use.
-*/}}
-{{- define "admin.labels" -}}
-app: {{ template "admin.name" . }}
-app.kubernetes.io/name: {{ template "admin.name" . }}
-helm.sh/chart: {{ include "admin.name" . }}-{{ .Values.image.tag }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Return Jobs Labels to use.
-*/}}
-{{- 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 }}
-{{- end -}}
-
-{{/*
-Return Traefik Labels.
-*/}}
-{{- define "traefik.labels" -}}
-app.kubernetes.io/name: {{ template "traefik.name" . }}
-{{- end -}}
-
-{{/*
-Return Admin matchLabels to use.
-*/}}
-{{- define "admin.matchLabels" -}}
-app.kubernetes.io/name: {{ template "admin.name" . }}
-helm.sh/chart: {{ include "admin.name" . }}-{{ .Values.image.tag }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Return Traefik matchLabels to use.
-*/}}
-{{- define "traefik.matchLabels" -}}
-app.kubernetes.io/name: {{ template "traefik.name" . }}
-{{- end -}}
-
-{{/*
-Return Admin Service Selector to use.
-*/}}
-{{- define "admin.selector" -}}
-{{ include "admin.name" . }}
-{{- end -}}
-
-{{/*
-Return Admin Port to use.
-*/}}
-{{- define "admin.port" -}}
-{{- printf "8080" -}}
-{{- end -}}
-
-{{/*
-Return xds Port to use.
-*/}}
-{{- define "admin.xds.Port" -}}
-{{- print "5678" -}}
-{{- end -}}
-
-{{/*
-Return Admin Port to use.
-*/}}
-{{- define "admin.web.port" -}}
-{{- printf "8888" -}}
-{{- end -}}
-
-{{/*
-Return Admin admissionServer Container Port to use.
-*/}}
-{{- define "admin.admissionServer.containerPort" -}}
-{{- printf "5443" -}}
-{{- end -}}
-
-{{/*
-Return ZooKeeper Client Port to use.
-*/}}
-{{- define "zoo.client" -}}
-{{- printf "2181" -}}
-{{- end -}}
-
-{{/*
-Return ZooKeeper Follower Port to use.
-*/}}
-{{- define "zoo.follower" -}}
-{{- printf "2888" -}}
-{{- end -}}
-
-{{/*
-Return ZooKeeper Election Port to use.
-*/}}
-{{- define "zoo.election" -}}
-{{- printf "3888" -}}
-{{- end -}}
-
-{{/*
-Return Nacos Port to use.
-*/}}
-{{- define "nacos.port" -}}
-{{- printf "8848" -}}
-{{- end -}}
-
-{{- define "traefik.metrics.containerPort" -}}
-{{- printf "9100" -}}
-{{- end -}}
-
-{{- define "traefik.metrics.hostPort" -}}
-{{- printf "9101" -}}
-{{- end -}}
-
-{{- define "traefik.traefik.containerPort" -}}
-{{- printf "9000" -}}
-{{- end -}}
-
-{{- define "traefik.web.containerPort" -}}
-{{- printf "8000" -}}
-{{- end -}}
-
-{{- define "traefik.web.hostPort" -}}
-{{- printf "80" -}}
-{{- end -}}
-
-{{- define "traefik.websecure.containerPort" -}}
-{{- printf "8443" -}}
-{{- end -}}
-
-{{- define "traefik.websecure.hostPort" -}}
-{{- printf "443" -}}
-{{- end -}}
-
-{{- define "prom.port" -}}
-{{- printf "9090" -}}
-{{- end -}}
-
-{{- define "grafana.port" -}}
-{{- printf "3000" -}}
-{{- 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 -}}
-
-{{- define "traefik.annotations" -}}
-prometheus.io/scrape: "true"
-prometheus.io/path: "/metrics"
-prometheus.io/port: "9100"
-{{- end -}}
-
-{{- define "traefik.ingress.annotations" -}}
-ingress.kubernetes.io/ssl-redirect: "true"
-ingress.kubernetes.io/proxy-body-size: "0"
-nginx.ingress.kubernetes.io/ssl-redirect: "true"
-nginx.ingress.kubernetes.io/proxy-body-size: "0"
-{{- end -}}
diff --git a/manifests/charts/admin/templates/certificates.yaml
b/manifests/charts/admin/templates/certificates.yaml
deleted file mode 100644
index 1c1c8160..00000000
--- a/manifests/charts/admin/templates/certificates.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-{{/*
-Generate certificates
-see: https://masterminds.github.io/sprig/crypto.html
-see: https://medium.com/nuvo-group-tech/move-your-certs-to-helm-4f5f61338aca
-see:
https://github.com/networkservicemesh/networkservicemesh/blob/804ad5026bb5dbd285c220f15395fe25e46f5edb/deployments/helm/nsm/charts/admission-webhook/templates/admission-webhook-secret.tpl
-
-We only autogenerate certs if user did not chose their own secret.
-We only autogenerate certs if the cert is not yet generated. This way we keep
the secrets between HELM upgrades.
-*/}}
-{{- $admin := .Values -}}
-{{- if not (eq (empty $admin.cp.tls.caBundle) (empty
$admin.cp.tls.secretName)) }}
- {{ fail "You need to send both or neither of
controlPlane.tls.general.caBundle and controlPlane.tls.general.secretName"}}
-{{- end }}
-{{- $caBundle := $admin.cp.tls.caBundle }}
-{{- $namespace := include "admin.namespace" . -}}
-{{- if eq $admin.cp.tls.secretName "" -}}
-{{- $cert := "" }}
-{{- $key := "" }}
-{{- $secretName := print (include "admin.name" .) "-tls-cert" }}
-{{- $secret := (lookup "v1" "Secret" $namespace $secretName) -}}
-{{- if $secret -}}
- {{- $cert = index $secret.data "tls.crt" -}}
- {{- $key = index $secret.data "tls.key" -}}
- {{- $caBundle = index $secret.data "ca.crt" -}}
-{{- else -}}
- {{- $name := (include "admin.name" .) -}}
- {{- $altNames := list (printf "%s.%s" $name $namespace) (printf "%s.%s.svc"
$name $namespace) -}}
- {{- $certTTL := 3650 -}}
- {{- $ca := genCA "dubbo-ca" $certTTL -}}
-
- {{- $genCert := genSignedCert $name nil $altNames $certTTL $ca -}}
- {{- $cert = $genCert.Cert | b64enc -}}
- {{- $key = $genCert.Key | b64enc -}}
- {{ $caBundle = $ca.Cert | b64enc }}
-{{- end -}}
----
-{{- if .Values.cp.enabled }}
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ include "admin.name" . }}-tls-cert
- namespace: {{ .Release.Namespace }}
- labels: {{ include "admin.labels" . | nindent 4 }}
-type: kubernetes.io/tls
-data:
- tls.crt: {{ $cert }}
- tls.key: {{ $key }}
- ca.crt: {{ $caBundle }}
-{{- end }}
-{{- end }}
diff --git a/manifests/charts/admin/templates/configmap.yaml
b/manifests/charts/admin/templates/configmap.yaml
deleted file mode 100644
index 5ef88aed..00000000
--- a/manifests/charts/admin/templates/configmap.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{- $admin := .Values -}}
-{{- $jobs := .Values.jobs -}}
-{{- $prom := .Values.kubePrometheus }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ template "admin.name" . }}-config
- namespace: {{ template "admin.namespace" . }}
- labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $admin.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
-data:
- config.yaml: |-
- {{- if $admin.cp }}
- {{ toYaml $admin.cp | nindent 4 | trim }}
- {{- end -}}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "job.name" . }}-config
- namespace: {{ template "admin.namespace" . }}
- labels:
- {{- 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"
-data:
- helm.sh: |-
- #!/bin/bash
- set -eux
- {{- if (eq $prom.enabled true) }}
- PROMETHEUS="https://prometheus-community.github.io/helm-charts";
-
- helm pull {{ include "prom.stack.name" . }} --repo "$PROMETHEUS"
--version {{ $prom.image.tag }} --untar && \
-
- for i in {1..5}; do
- if rm -rf "{{ include "prom.stack.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/resources/dubbo-metrics.yaml" "{{ include "prom.stack.name"
. }}/templates/{{ include "grafana.name" . }}/dashboards-{{
$prom.dashboardsVersion }}"
- ls -la "{{ include "prom.stack.name" . }}/templates/{{ include
"grafana.name" . }}/dashboards-{{ $prom.dashboardsVersion }}"
-
- if helm ls --all | grep "{{ include "prom.name" . }}"; then
- helm uninstall {{ include "prom.name" . }} -n dubbo-system && helm
install {{ include "prom.name" . }} "./{{ include "prom.stack.name" . }}/" -n
dubbo-system
- else
- helm install {{ include "prom.name" . }} "./{{ include "prom.stack.name"
. }}/" -n dubbo-system
- fi
- {{- end }}
- dubbo-metrics.yaml: |-
- {{- .Files.Get "files/resources/dubbo-metrics.yaml" | nindent 4 }}
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/deployment.yaml
b/manifests/charts/admin/templates/deployment.yaml
index a573c495..76eecf42 100644
--- a/manifests/charts/admin/templates/deployment.yaml
+++ b/manifests/charts/admin/templates/deployment.yaml
@@ -1,158 +1,80 @@
{{- $admin := .Values -}}
-{{- $cp := .Values.cp -}}
{{- $zoo := .Values.zookeeper }}
{{- $nacos := .Values.nacos }}
-{{- $prom := .Values.kubePrometheus }}
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
+ name: admin-dashboard
+ namespace: {{ .Release.Namespace }}
labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $admin.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
spec:
replicas: {{ $admin.replicas }}
strategy:
- {{- if $admin.strategy }}
- {{- toYaml $admin.strategy | nindent 4 }}
- {{- end }}
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 1
+ type: RollingUpdate
selector:
matchLabels:
- {{- include "admin.matchLabels" . | nindent 6 }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ dubbo: admin
template:
metadata:
labels:
- {{- include "admin.labels" . | nindent 8 }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
spec:
- {{- if $admin.imagePullSecrets }}
- imagePullSecrets: {{ toYaml $admin.imagePullSecrets | nindent 8 }}
- {{- end }}
- {{- if $admin.nodeSelector }}
- nodeSelector: {{ toYaml $admin.nodeSelector | nindent 8 }}
- {{- end }}
- {{- if $admin.tolerations }}
- tolerations: {{ toYaml $admin.tolerations | nindent 8 }}
- {{- end }}
- {{- if $admin.terminationGracePeriodSeconds }}
- terminationGracePeriodSeconds: {{ $admin.terminationGracePeriodSeconds }}
- {{- end }}
- serviceAccountName: {{ template "admin.name" . }}
+ serviceAccountName: admin-sa
containers:
- name: admin
image: {{ $admin.image.registry }}:{{ $admin.image.tag }}
imagePullPolicy: {{ $admin.image.pullPolicy }}
- lifecycle:
- {{- if $admin.lifecycleHooks }}
- {{- toYaml $admin.lifecycleHooks | nindent 10 }}
- {{- end }}
- # args:
- # - run
- # - --config-file=/etc/dubbo.io/config.yaml
ports:
- - name: admin-http
+ - name: http
containerPort: 8888
- - name: admin-grpc
- containerPort: 5678
- - name: admin-admission
- containerPort: 5443
env:
{{- if $nacos.enabled }}
- name: DUBBO_STORE_TRADITIONAL_REGISTRY
- value: nacos://nacos-0.nacos.dubbo-system.svc.cluster.local:8848
+ value: nacos://nacos:8848
{{- else if $zoo.enabled }}
- name: DUBBO_STORE_TRADITIONAL_REGISTRY
- value:
zookeeper://zookeeper-0.zookeeper.dubbo-system.svc.cluster.local:2181
+ value: zookeeper://zookeeper:2181
{{- else }}
- name: DUBBO_STORE_TRADITIONAL_REGISTRY
- value: nacos://nacos-0.nacos.dubbo-system.svc.cluster.local:8848
+ value: nacos://nacos:8848
{{- 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" . }}
- {{- $promStationaryName := printf "kube-prome-prometheus" }}
- {{- $promFullName := printf "%s-%s" $promName $promStationaryName }}
- {{- if $prom.enabled }}
- name: ADMIN_PROMETHEUS_ADDRESS
- value: {{ $promFullName }}:{{ $promPort }}
- {{- $grafanaName := include "grafana.name" . }}
- {{- $grafanaPort := include "grafana.port" . }}
- {{- $grafanaFullName := printf "%s-%s" $promName $grafanaName }}
+ value: prometheus:9090
- name: ADMIN_GRAFANA_ADDRESS
- value: {{ $grafanaFullName }}:{{ $grafanaPort }}
- {{- end }}
+ value: grafana:3000
volumeMounts:
- {{- if $admin.volumeMounts }}
- {{- toYaml $admin.volumeMounts | nindent 8 }}
- {{- end }}
-{{/* - name: general-tls-cert*/}}
-{{/* mountPath: /var/run/secrets/dubbo.io/tls-cert/tls.crt*/}}
-{{/* subPath: tls.crt*/}}
-{{/* readOnly: true*/}}
-{{/* - name: general-tls-cert*/}}
-{{/* mountPath: /var/run/secrets/dubbo.io/tls-cert/tls.key*/}}
-{{/* subPath: tls.key*/}}
-{{/* readOnly: true*/}}
-{{/* - name: general-tls-cert{{- if $cp.tls.caSecretName }}-ca{{- end
}}*/}}
-{{/* mountPath: /var/run/secrets/dubbo.io/tls-cert/ca.crt*/}}
-{{/* subPath: ca.crt*/}}
-{{/* readOnly: true*/}}
-{{/* - name: config*/}}
-{{/* mountPath: /etc/dubbo.io/config.yaml*/}}
-{{/* subPath: config.yaml*/}}
-{{/* readOnly: true*/}}
- securityContext:
- {{- if $admin.securityContext }}
- {{- toYaml $admin.securityContext | nindent 10 }}
- {{- end }}
- startupProbe:
- {{- if $admin.startupProbe }}
- {{- toYaml $admin.startupProbe | nindent 10 }}
- {{- end }}
- livenessProbe:
- {{- if $admin.livenessProbe }}
- {{- toYaml $admin.livenessProbe | nindent 10 }}
- {{- end }}
+ - name: data
+ mountPath: /var/lib/admin-dashboard-data
readinessProbe:
- {{- if $admin.readinessProbe }}
- {{- toYaml $admin.readinessProbe | nindent 10 }}
- {{- end }}
+ httpGet:
+ path: /admin
+ port: 8888
+ initialDelaySeconds: 60
+ successThreshold: 1
+ failureThreshold: 5
+ periodSeconds: 10
+ timeoutSeconds: 30
resources:
- {{- if $admin.resources }}
- {{- toYaml $admin.resources | nindent 10 }}
- {{- end }}
+{{ toYaml $admin.resources | trim | indent 10 }}
volumes:
- {{- if $admin.volumes }}
- {{- toYaml $admin.volumes | nindent 6 }}
- {{- end }}
-{{/* - name: config*/}}
-{{/* configMap:*/}}
-{{/* name: {{ include "admin.name" . }}-config*/}}
-{{/* {{- if $cp.tls.secretName }}*/}}
-{{/* - name: general-tls-cert*/}}
-{{/* secret:*/}}
-{{/* secretName: {{ $cp.tls.secretName }}*/}}
-{{/* {{- else }}*/}}
-{{/* - name: general-tls-cert*/}}
-{{/* secret:*/}}
-{{/* secretName: {{ include "admin.name" . }}-tls-cert*/}}
-{{/* {{- end }}*/}}
-{{/* {{- if $cp.tls.caSecretName }}*/}}
-{{/* - name: general-tls-cert-ca*/}}
-{{/* secret:*/}}
-{{/* secretName: {{ $cp.tls.caSecretName }}*/}}
-{{/* {{- end }}*/}}
- - name: storage
- {{- if $admin.persistence.enabled }}
- persistentVolumeClaim:
- {{- with $admin.persistence }}
- {{- if .claimName }}
- claimName: {{ .claimName }}
- {{- else }}
- emptyDir: {}
- {{- end -}}
- {{- end -}}
- {{- end -}}
\ No newline at end of file
+ - name: data
+ hostPath:
+ path: /tmp/admin-dashboard-data
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/persistentvolumeclaim.yaml
b/manifests/charts/admin/templates/persistentvolumeclaim.yaml
deleted file mode 100644
index 529fc69b..00000000
--- a/manifests/charts/admin/templates/persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-{{- $pvc := .Values.persistence -}}
-{{- if $pvc.enabled }}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
- labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $pvc.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $pvc.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
-spec:
- accessModes:
- {{- with $pvc.accessModes }}
- - {{ . | quote }}
- {{- end }}
- resources:
- requests:
- storage: {{ $pvc.size | quote }}
- {{- with $pvc.storageclass }}
- storageClassName: {{ . }}
- {{- end }}
- selector:
- matchLabels:
- {{- toYaml . | nindent 6 }}
-{{- end }}
diff --git a/manifests/charts/admin/templates/rbac.yaml
b/manifests/charts/admin/templates/rbac.yaml
index 3929754f..a71e7fd3 100644
--- a/manifests/charts/admin/templates/rbac.yaml
+++ b/manifests/charts/admin/templates/rbac.yaml
@@ -1,91 +1,34 @@
-{{- $sa := .Values.serviceAccount -}}
-{{- $rbac := .Values.rbac -}}
-{{- $psp := .Values.podSecurityPolicy -}}
-{{- if $sa.enabled }}
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
+ name: admin-sa
+ namespace: {{ .Release.Namespace }}
labels:
- {{- if $sa.labels }}
- {{- include "admin.labels" . | nindent 4 }}
- {{- end }}
- {{- with $sa.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $sa.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
-{{- end }}
----
-{{- if $rbac.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
- labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $rbac.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $rbac.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
-rules:
-- apiGroups:
- - ""
- resources:
- - namespaces
- - pods
- verbs:
- - get
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
- labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $rbac.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $rbac.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ template "admin.name" . }}
-subjects:
-- kind: ServiceAccount
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- name: {{ template "admin.name" . }}-clusterrole
+ name: admin-dashboard-clusterrole
labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $rbac.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $rbac.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
rules:
- apiGroups:
- - app
+ - ""
resources:
- deployments
- - statefulsets
verbs:
- get
- list
@@ -94,7 +37,6 @@ rules:
- ""
resources:
- services
- - endpoints
verbs:
- get
- list
@@ -102,38 +44,30 @@ rules:
- apiGroups:
- ""
resources:
- - secrets
- - configmaps
+ - namespaces
+ - pods
verbs:
- get
- list
- watch
-- apiGroups:
- - networking.k8s.io
- resources:
- - ingresses
- verbs:
- - get
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
- name: {{ template "admin.name" . }}-clusterrolebinding
+ name: admin-dashboard-clusterrolebinding
labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $rbac.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $rbac.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
subjects:
- kind: ServiceAccount
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
+ name: admin-sa
+ namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
- name: {{ template "admin.name" . }}-clusterrole
- apiGroup: rbac.authorization.k8s.io
-{{- end -}}
\ No newline at end of file
+ name: admin-dashboard-clusterrole
+ apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/service.yaml
b/manifests/charts/admin/templates/service.yaml
index f3fb5fc5..f7be8167 100644
--- a/manifests/charts/admin/templates/service.yaml
+++ b/manifests/charts/admin/templates/service.yaml
@@ -3,95 +3,45 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ template "admin.name" . }}
- namespace: {{ template "admin.namespace" . }}
+ name: admin-dashboard
+ namespace: {{ .Release.Namespace }}
labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $svc.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $svc.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
spec:
- {{- if $svc.type }}
- type: {{ $svc.type }}
- {{- end }}
- {{- if $svc.clusterIP }}
- clusterIP: {{ $svc.clusterIP }}
- {{- end }}
- {{- if $svc.externalIPs }}
- externalIPs: {{ $svc.externalIPs }}
- {{- end }}
- {{- if $svc.loadBalancerIP }}
- loadBalancerIP: {{ $svc.loadBalancerIP }}
- {{- end }}
- {{- if $svc.loadBalancerSourceRanges }}
- loadBalancerSourceRanges: {{ $svc.loadBalancerSourceRanges }}
- {{- end }}
- {{- if $svc.loadBalancerClass }}
- loadBalancerClass: {{ $svc.loadBalancerClass }}
- {{- end }}
ports:
- - name: admin-http
+ - name: http
port: 8888
- targetPort: admin-http
- appProtocol: TCP
- - name: admin-grpc
- port: 5678
- targetPort: admin-grpc
+ targetPort: http
selector:
- app: {{ template "admin.selector" . }}
+ app: admin-dashboard
{{- end }}
---
{{- if $svc.enabled }}
apiVersion: v1
kind: Service
metadata:
- name: {{ include "admin.name" . }}-headless
+ name: admin-dashboard-headless
namespace: {{ include "admin.namespace" . }}
labels:
- {{- include "admin.labels" . | nindent 4 }}
- {{- with $svc.labels }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
- annotations:
- {{- with $svc.annotations }}
- {{- toYaml . | nindent 4 }}
- {{- end }}
+ app: admin
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Admin"
+ dubbo: admin
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "dashboard"
spec:
- {{- if $svc.type }}
- type: {{ $svc.type }}
- {{- end }}
clusterIP: None
- {{- if $svc.externalIPs }}
- externalIPs: {{ $svc.externalIPs }}
- {{- end }}
- {{- if $svc.loadBalancerIP }}
- loadBalancerIP: {{ $svc.loadBalancerIP }}
- {{- end }}
- {{- if $svc.loadBalancerSourceRanges }}
- loadBalancerSourceRanges: {{ $svc.loadBalancerSourceRanges }}
- {{- end }}
- {{- if $svc.loadBalancerClass }}
- loadBalancerClass: {{ $svc.loadBalancerClass }}
- {{- end }}
- {{- if $svc.sessionAffinity }}
- sessionAffinity: {{ $svc.sessionAffinity }}
- {{- end }}
- {{- if $svc.publishNotReadyAddresses }}
- publishNotReadyAddresses: {{ $svc.publishNotReadyAddresses }}
- {{- end }}
ports:
- - name: admin-http
+ - name: http
port: 8888
- targetPort: admin-http
- appProtocol: tcp
- - name: admin-grpc
- port: 5678
- targetPort: admin-grpc
- appProtocol: tcp
+ targetPort: http
selector:
- app: {{ template "admin.selector" . }}
+ app: admin-dashboard
{{- end -}}
diff --git a/manifests/charts/admin/templates/zzz_profile.yaml
b/manifests/charts/admin/templates/zzz_profile.yaml
index 056b69ee..2f620be4 100644
--- a/manifests/charts/admin/templates/zzz_profile.yaml
+++ b/manifests/charts/admin/templates/zzz_profile.yaml
@@ -2,6 +2,7 @@
{{ fail (cat
"`--set defaults.foo=bar` with `--set foo=bar`. Defaults set:\n"
($.Values.defaults | toYaml |nindent 4) ) }}
+
{{- end }}
{{- $defaults := $.Values._internal_default_values_not_set }}
{{- $_ := unset $.Values "_internal_default_values_not_set " }}
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 5bcedd83..09ab29a3 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -14,24 +14,6 @@
# limitations under the License.
_internal_default_values_not_set:
- ## Override the namespace where the resource is deployed.
- namespaceOverride: ~
-
- ## Labels to attach to the resource.
- labels: ~
-
- ## Annotations to attach to the resource.
- annotations: ~
-
- ## Node selector to constrain where the pods can be scheduled.
- nodeSelector: ~
-
- ## List of image pull secrets for pulling private container images.
- imagePullSecrets: ~
-
- ## Specifies the cluster's domain name for DNS resolution.
- clusterDomain: cluster.local
-
## Number of replicas for the Deployment.
replicas: 1
@@ -44,22 +26,6 @@ _internal_default_values_not_set:
# Image pull policy, available options are: Always, IfNotPresent, Never.
pullPolicy: IfNotPresent
- rbac:
- # Whether to enable the RBAC.
- enabled: true
- # Labels for RBAC resources.
- labels: ~
- # Annotations for RBAC resources.
- annotations: ~
-
- serviceAccount:
- # Whether to enable the ServiceAccount.
- enabled: true
- # Labels to be applied to the ServiceAccount.
- labels: ~
- # Annotations to be added to the ServiceAccount.
- annotations: ~
-
## Define volume mounts for the application, Each item in the list
represents a separate volume mount.
volumeMounts: ~
## Example:
@@ -73,420 +39,35 @@ _internal_default_values_not_set:
# hostPath:
# path: /data
- strategy:
- # Define the strategy for the application's deployment.
- type: RollingUpdate
- # Additional configuration for the RollingUpdate strategy can be specified
here.
- rollingUpdate:
- # Maximum number or percentage of new replicas that can be created
during an update.
- maxSurge: 25%
- # Maximum number or percentage of replicas that can be unavailable
during an update.
- maxUnavailable: 1
-
- updateStrategy:
- # Define the update strategy for the application's statefulSet.
- type: RollingUpdate
- # Additional configuration for the RollingUpdate update strategy can be
specified here.
- rollingUpdate: ~
-
- ## Termination grace period for pods.
- terminationGracePeriodSeconds: 30
-
-# startupProbe:
-# # Delay before the probe is initiated.
-# initialDelaySeconds: 60
-# # Time to wait for the probe to complete.
-# timeoutSeconds: 30
-# # How often to perform the probe.
-# periodSeconds: 10
-# # Minimum consecutive successes for the probe to be considered successful.
-# successThreshold: 1
-# # Perform an HTTP GET request to check.
-# httpGet:
-# # The path to use for the HTTP GET request.
-# path: /health
-# # The port on which the HTTP GET request will be made.
-# port: 8888
-# readinessProbe:
-# # Delay before the probe is initiated.
-# initialDelaySeconds: 60
-# # Time to wait for the probe to complete.
-# timeoutSeconds: 30
-# # How often to perform the probe.
-# periodSeconds: 10
-# # Minimum consecutive successes for the probe to be considered successful.
-# successThreshold: 1
-# # Perform an HTTP GET request to check.
-# httpGet:
-# # The path to use for the HTTP GET request.
-# path: /health
-# # The port on which the HTTP GET request will be made.
-# port: 8888
-# livenessProbe:
-# # Delay before the probe is initiated.
-# initialDelaySeconds: 60
-# # Time to wait for the probe to complete.
-# timeoutSeconds: 30
-# # How often to perform the probe.
-# periodSeconds: 10
-# # Minimum consecutive successes for the probe to be considered successful.
-# successThreshold: 1
-# # Perform an HTTP GET request to check.
-# httpGet:
-# # The path to use for the HTTP GET request.
-# path: /health
-# # The port on which the HTTP GET request will be made.
-# port: 8888
- ## Define lifecycle hooks for the application container.
- lifecycleHooks: ~
- # postStart:
- # exec:
- # command: ["/bin/sh", "-c", "echo Discover Infinite Possibilities,
Starting Now! >> /var/log/postStart.log"]
- # preStop:
- # exec:
- # command: ["/bin/sh", "-c", "while true; do echo Shutting down... >>
/var/log/postStop.log; sleep 30; done"]
-
- service:
- # Whether to enable the service.
- enabled: true
- # Labels to be applied to the service.
- labels: ~
- # Annotations to be added to the service.
- annotations: ~
- # Specifies the service type (ClusterIP, NodePort, LoadBalancer, etc.).
- type: ClusterIP
- # Specifies the ClusterIP for the service, or use "~" to auto-assign.
- clusterIP: ~
- # List of external IPs to associate with the service.
- externalIPs: ~
- # Specifies the IP address for a LoadBalancer service.
- loadBalancerIP: ~
- # Restrict access to the LoadBalancer by IP ranges.
- loadBalancerSourceRanges: ~
- # Specifies the LoadBalancer class (if applicable).
- loadBalancerClass: ~
- # Specifies the session affinity mode (None, ClientIP)
- sessionAffinity: None
- # Set to 'true' to publish endpoints for not-ready pods.
- publishNotReadyAddresses: true
-
resources:
- # Maximum CPU and memory resources allowed for the container.
- limits:
- # CPU usage limit.
- cpu: 512m
- # Memory usage limit.
- memory: 512Mi
- # Initial CPU and memory resource requests for the container.
requests:
- # CPU usage request.
cpu: 512m
- # Memory usage request.
memory: 512Mi
- ## Define toleration's for the application pods.
- tolerations: ~
- # - key: CriticalAddonsOnly
- # operator: Exists
- # - effect: NoSchedule
- # key: node-role.kubernetes.io/control-plane
-
- persistence:
- # Whether to enable the persistence volume.
- enabled: false
- # Labels to be applied to the persistence volume.
- labels: ~
- # Annotations to be added to the persistence volume.
- annotations: ~
- # Name of the PersistentVolumeClaim.
- claimName: ""
- # Storage class for the PersistentVolumeClaim.
- storageclass: ""
- # Size of the PersistentVolumeClaim.
- size: 5Gi
- # Access modes for the PersistentVolumeClaim.
- accessModes: ReadWriteOnce
-
- securityContext:
- # Specifies the user ID under which the container should run.
- runAsUser: 1000
- # Specifies the user ID under which the container should run.
- runAsGroup: 1000
- # Set to 'true' to run the container as a non-root user.
- runAsNonRoot: false
- # Prevent the container from writing to the root file system.
- readOnlyRootFilesystem: true
- # Set to 'false' to disallow privilege escalation for the container.
- allowPrivilegeEscalation: false
-
- podSecurityPolicy:
- # Whether to enable the PSP.
- enabled: false
- # Labels to be applied to the PSP.
- labels: ~
- # Annotations to be added to the PSP.
- annotations: ~
-
- jobs:
- # Override the namespace where the resource is deployed.
- namespaceOverride: ~
- # Labels to attach to the resource.
- labels: ~
- # Annotations to attach to the resource.
- annotations: ~
- # Specify the restart policy (OnFailure, Never, Always, etc.).
- restartPolicy: OnFailure
-
- image:
- # Source of the container image.
- registry: docker.io/bitnami/kubectl
- # Version tag of the container image.
- tag: 1.28.4
- # Image pull policy, available options are: Always, IfNotPresent, Never.
- pullPolicy: IfNotPresent
-
- # TODO Waiting for the control plane
- cp:
- enabled: false
- deploy_mode: universal
- mode: zone # test
- tls:
- secretName: ""
- caSecretName: ""
- caBundle: ""
- store:
- traditional:
- config_center: zookeeper://zookeeper:2181
- registry:
- address: zookeeper://zookeeper:2181
- metadata_report:
- address: zookeeper://zookeeper:2181
- # Uncomment the following block if you want to use Nacos instead of
Zookeeper
- # nacos:
- # config_center: nacos://nacos:8848
- # registry:
- # address: nacos://nacos:8848
- # metadata_report:
- # address: nacos://nacos:8848
- admin:
- prometheus:
http://kube-prometheus-kube-prome-prometheus.svc.cluster.local:9090
- metric:
- application:
- baseURL:
http://kube-prometheus-grafana:3000/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
- instance:
- baseURL:
http://kube-prometheus-grafana:3000/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
- service:
- baseURL:
http://kube-prometheus-grafana:3000/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service
- trace:
- application:
- baseURL:
http://kube-prometheus-grafana:3000/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
- instance:
- baseURL:
http://kube-prometheus-grafana:3000/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
- service:
- baseURL:
http://kube-prometheus-grafana:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
- multizone:
- zone:
- globalAddress: grpc://127.0.0.1:5685
- global:
- dds:
- grpcPort: 5685
- runtime:
- kubernetes:
- admissionServer:
- address: 10.23.132.51
- port: 5443
- certDir: test/cert
-
- # TODO
- auth:
- ## Whether to enable the control-plane auth control.
- enabled: false
-
- authorization:
- # Specify the action for authorization (DENY, ALLOW, etc.)
- action: DENY
- # Specify the match type for authorization (anyMatch, allMatch, etc.)
- matchType: anyMatch
- # Specify the match type for authorization rule sampling rate has a
range of 0 to 100.
- samples: 0
-
- authentication:
- # Specify the action for authentication (STRICT, PERMISSIVE, etc.)
- action: STRICT
- # Specify the action for authentication port number for applying the
authentication policy
- port: 38080
- # TODO Waiting for the control plane
- traffic:
- ## Whether to enable the traffic.
- enabled: false
-
- conditionRoute:
- # Supports service and application scope rules.
- scope: service
- # Whether enable this rule or not, set enabled:false to disable this
rule.
- enabled: true
- # The behaviour when the instance subset is empty after routing.
- force: true
- # Whether run routing rule for every rpc invocation or use routing cache
if available.
- runtime: true
- # Specify the specific priority for traffic (adjust within the range 1 ~
100).
- priority: 100
- # The version of the condition rule definition, currently available
version is v3.0.
- configVersion: v3.0
- # The identifier of the target service or application that this rule is
about to apply to.
- # If scope:service is set, then keyshould be specified as the Dubbo
service key that this rule targets to control.
- # If scope:application is set, then keyshould be specified as the name
of the application that this rule targets to control, application should always
be a Dubbo Consumer.
- key: org.apache.dubbo.samples.CommentService
- # The condition routing rule definition of this configuration. Check
Condition for details.
- conditions: method=getComment => region=Hangzhou
-
- dynamicConfig:
- # Supports service and application scope rules.
- scope: service
- # The version of the tag rule definition, currently available version is
v3.0.
- configVersion: v3.0
- # The identifier of the target service or application that this rule is
about to apply to.
- # If scope:service is set, then keyshould be specified as the Dubbo
service key that this rule targets to control.
- # If scope:application is set, then keyshould be specified as the name
of the application that this rule targets to control, application should always
be a Dubbo Consumer.
- key: org.apache.dubbo.samples.UserService
- # Especially useful when scope:service is set.
- # side: providermeans this Config will only take effect on the provider
instances of the service key.
- # side: consumermeans this Config will only take effect on the consumer
instances of the service key
- side: consumer
- # The application matching condition for this config rule to take effect.
- # Effective when scope:service is set.
- # https://github.com/google/re2/wiki/Syntax.
- # exact: value for exact string
- exact: shop-frontend
-
- tagRoute:
- # The name of the tag used to match the dubbo tag value in the request
context.
- name: gray
- # Whether enable this rule or not, set enabled:false to disable this
rule.
- enabled: false
- # The behaviour when the instance subset is empty after routing.
- force: true
- # The version of the tag rule definition, currently available version is
v3.0.
- configVersion: v3.0
- # Specify the specific priority for traffic (adjust within the range 1 ~
100).
- priority: 99
- # The identifier of the target application that this rule is about to
control.
- key: details
-
- 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
-
- ingress:
- ## Whether to enable the ingress.
- enabled: false
- ## Configure the application ingress domain name
- hosts:
- # Specify the host for the admin Ingress
- admin: admin.k8s.example
- # Specify the host for the Prometheus Ingress
- prometheus: prom.k8s.example
- # Specify the host for the Grafana Ingress
- grafana: grafana.k8s.example
- ## Override the name of the resource.
- nameOverride: ~
- ## Override the namespace where the resource is deployed.
- namespaceOverride: ~
- ## Labels to attach to the resource.
- labels: ~
- ## Annotations to attach to the resource.
- annotations: ~
- ## Node selector to constrain where the pods can be scheduled.
- nodeSelector: ~
- ## Number of replicas for the Deployment.
- replicas: 1
- ## Configure the application image
- image:
- # Source of the container image.
- registry: docker.io/traefik
- # Version tag of the container image.
- tag: v2.10.4
- # Image pull policy, available options are: Always, IfNotPresent, Never.
- pullPolicy: IfNotPresent
- readinessProbe:
- # Number of consecutive failures before marking the container as
unhealthy.
- failureThreshold: 1
- # Delay before the probe is initiated.
- initialDelaySeconds: 2
- # How often to perform the probe.
- periodSeconds: 10
- # Minimum consecutive successes for the probe to be considered
successful.
- successThreshold: 1
- # Time to wait for the probe to complete.
- timeoutSeconds: 2
- # Perform an HTTP GET request to check.
- httpGet:
- # The path to use for the HTTP GET request.
- path: /ping
- # The port on which the HTTP GET request will be made.
- port: 9000
- # The protocol used for the HTTP GET request (HTTP, HTTPS).
- scheme: HTTP
- livenessProbe:
- # Number of consecutive failures before marking the container as
unhealthy.
- failureThreshold: 3
- # Delay before the probe is initiated.
- initialDelaySeconds: 2
- # How often to perform the probe.
- periodSeconds: 10
- # Minimum consecutive successes for the probe to be considered
successful.
- successThreshold: 1
- # Time to wait for the probe to complete.
- timeoutSeconds: 2
- # Perform an HTTP GET request to check.
- httpGet:
- # The path to use for the HTTP GET request.
- path: /ping
- # The port on which the HTTP GET request will be made.
- port: 9000
- # The protocol used for the HTTP GET request (HTTP, HTTPS).
- scheme: HTTP
- strategy:
- # Additional configuration for the RollingUpdate strategy can be
specified here.
- rollingUpdate:
- # Maximum number of pods that can be created above the desired replica
count.
- maxSurge: 1
- # Maximum number of pods that can be unavailable during the update.
- maxUnavailable: 0
- securityContext:
- # Specifies the user ID under which the container should run.
- runAsUser: 65532
- # Specifies the group ID under which the container should run.
- runAsGroup: 65532
- # Set to 'true' to run the container as a non-root user.
- runAsNonRoot: true
- containersecurityContext:
- # Configure Linux capabilities for the container.
- capabilities:
- # Drop all capabilities
- drop:
- - ALL
- # Prevent the container from writing to the root file system.
- readOnlyRootFilesystem: true
- # Set to 'false' to disallow privilege escalation for the container.
- allowPrivilegeEscalation: false
- resources:
- # Maximum CPU and memory resources allowed for the container.
- limits:
- # CPU usage limit.
- cpu: 100m
- # Memory usage limit.
- memory: 100Mi
- # Initial CPU and memory resource requests for the container.
- requests:
- # CPU usage request.
- cpu: 100m
- # Memory usage request.
- memory: 100Mi
+ deploy_mode: half
+ #mode: test
+ mode: zone
+ store:
+ traditional:
+ config_center: nacos://nacos:8848?username=nacos&password=nacos
+ registry:
+ address: nacos://nacos:8848?username=nacos&password=nacos
+ metadata_report:
+ address: nacos://nacos:8848?username=nacos&password=nacos
+ admin:
+ metric:
+ application:
+ baseURL:
http://kube-prometheus-grafana:3000/d/a0b114ca-edf7-4dfe-ac2c-34a4fc545fed/application
+ instance:
+ baseURL:
http://kube-prometheus-grafana:3000/d/dcf5defe-d198-4704-9edf-6520838880e9/instance
+ service:
+ baseURL:
http://kube-prometheus-grafana:3000/d/ec689613-b4a1-45b1-b8bd-9d557059f970/service
+ trace:
+ application:
+ baseURL:
http://kube-prometheus-grafana:3000/d/e968a89b-f03d-42e3-8ad3-930ae815cb0f/application
+ instance:
+ baseURL:
http://kube-prometheus-grafana:3000/d/f5f48f75-13ec-489b-88ae-635ae38d8618/instance
+ service:
+ baseURL:
http://kube-prometheus-grafana:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
+ prometheus:
http://kube-prometheus-kube-prome-prometheus.svc.cluster.local:9090
+ grafana: http://47.251.1.59:3000/
diff --git a/manifests/charts/base/templates/NOTES.txt
b/manifests/charts/base/templates/NOTES.txt
index e69de29b..66636b1c 100644
--- a/manifests/charts/base/templates/NOTES.txt
+++ b/manifests/charts/base/templates/NOTES.txt
@@ -0,0 +1 @@
+🌹 For more details, please visit https://dubbo.apache.org.
\ No newline at end of file
diff --git a/manifests/charts/base/templates/zzz_profile.yaml
b/manifests/charts/base/templates/zzz_profile.yaml
index 056b69ee..4ac6dafa 100644
--- a/manifests/charts/base/templates/zzz_profile.yaml
+++ b/manifests/charts/base/templates/zzz_profile.yaml
@@ -3,6 +3,7 @@
"`--set defaults.foo=bar` with `--set foo=bar`. Defaults set:\n"
($.Values.defaults | toYaml |nindent 4) ) }}
{{- end }}
+
{{- $defaults := $.Values._internal_default_values_not_set }}
{{- $_ := unset $.Values "_internal_default_values_not_set " }}
{{- $profile := dict }}
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/NOTES.txt
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/NOTES.txt
new file mode 100644
index 00000000..66636b1c
--- /dev/null
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/NOTES.txt
@@ -0,0 +1 @@
+🌹 For more details, please visit https://dubbo.apache.org.
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/NOTES.txt
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/NOTES.txt
new file mode 100644
index 00000000..66636b1c
--- /dev/null
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/NOTES.txt
@@ -0,0 +1 @@
+🌹 For more details, please visit https://dubbo.apache.org.
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
index 056b69ee..4ac6dafa 100644
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/zzz_profile.yaml
@@ -3,6 +3,7 @@
"`--set defaults.foo=bar` with `--set foo=bar`. Defaults set:\n"
($.Values.defaults | toYaml |nindent 4) ) }}
{{- end }}
+
{{- $defaults := $.Values._internal_default_values_not_set }}
{{- $_ := unset $.Values "_internal_default_values_not_set " }}
{{- $profile := dict }}
diff --git a/manifests/charts/admin/templates/traffic/authority.yaml
b/traffic/authority.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/authority.yaml
rename to traffic/authority.yaml
diff --git a/manifests/charts/admin/templates/traffic/config.yaml
b/traffic/config.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/config.yaml
rename to traffic/config.yaml
diff --git a/manifests/charts/admin/templates/traffic/rbac.yaml
b/traffic/rbac.yaml
similarity index 100%
rename from manifests/charts/admin/templates/traffic/rbac.yaml
rename to traffic/rbac.yaml
