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 c5604b20 [charts] add register plane pdb (#702)
c5604b20 is described below
commit c5604b204d1b3916c6d70834983327a6000dbeec
Author: Jian Zhong <[email protected]>
AuthorDate: Sat May 3 23:39:05 2025 +0800
[charts] add register plane pdb (#702)
---
manifests/charts/admin/templates/deployment.yaml | 2 +-
.../nacos/templates/_helpers.tpl | 0
.../nacos/templates/poddisruptionbudget.yaml | 20 +++++++++++++++++++
.../zookeeper/templates/_helpers.tpl | 23 ----------------------
.../zookeeper/templates/poddisruptionbudget.yaml | 20 +++++++++++++++++++
operator/pkg/component/component.go | 6 ++++++
operator/pkg/install/installer.go | 4 +++-
7 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/manifests/charts/admin/templates/deployment.yaml
b/manifests/charts/admin/templates/deployment.yaml
index 80e114b6..e3066855 100644
--- a/manifests/charts/admin/templates/deployment.yaml
+++ b/manifests/charts/admin/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
serviceAccountName: admin-sa
containers:
- name: admin
- image: "{{ $admin.image }}
+ image: "{{ $admin.image }}"
imagePullPolicy: IfNotPresent
ports:
- name: http
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/_helpers.tpl
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/_helpers.tpl
deleted file mode 100644
index e69de29b..00000000
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/poddisruptionbudget.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/poddisruptionbudget.yaml
new file mode 100644
index 00000000..9347eda3
--- /dev/null
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/poddisruptionbudget.yaml
@@ -0,0 +1,20 @@
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+ name: nacos
+ namespace: {{ .Release.Namespace }}
+ labels:
+ app: nacos
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Nacos"
+ dubbo: nacos
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "register"
+spec:
+ minAvailable: 1
+ selector:
+ matchLabels:
+ app: nacos
+ dubbo.io/rev: {{ default "default" | quote }}
+ dubbo: nacos
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/_helpers.tpl
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/_helpers.tpl
deleted file mode 100644
index e4687170..00000000
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/_helpers.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{/*
-Return the ZooKeeper client-server authentication credentials secret.
-*/}}
-{{- define "zookeeper.client.secretName" -}}
-{{- $zoo := .Values.registerCentre.zookeeper -}}
-{{- if $zoo.auth.client.existingSecret -}}
- {{- printf "%s" (tpl $zoo.auth.client.existingSecret $) -}}
-{{- else -}}
- {{- printf "zookeeper-client-auth" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Return the ZooKeeper server-server authentication credentials secret.
-*/}}
-{{- define "zookeeper.quorum.secretName" -}}
-{{- $zoo := .Values.registerCentre.zookeeper -}}
-{{- if $zoo.auth.quorum.existingSecret -}}
- {{- printf "%s" (tpl $zoo.auth.quorum.existingSecret $) -}}
-{{- else -}}
- {{- printf "zookeeper-quorum-auth" -}}
-{{- end -}}
-{{- end -}}
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/poddisruptionbudget.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/poddisruptionbudget.yaml
new file mode 100644
index 00000000..bb1239f2
--- /dev/null
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/poddisruptionbudget.yaml
@@ -0,0 +1,20 @@
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+ name: zookeeper
+ namespace: {{ .Release.Namespace }}
+ labels:
+ app: zookeeper
+ dubbo.io/rev: {{ default "default" | quote }}
+ install.operator.dubbo.io/owning-resource: {{ default "unknown" }}
+ operator.dubbo.io/component: "Zookeeper"
+ dubbo: zookeeper
+ release: {{ .Release.Name }}
+ app.kubernetes.io/name: "register"
+spec:
+ minAvailable: 1
+ selector:
+ matchLabels:
+ app: zookeeper
+ dubbo.io/rev: {{ default "default" | quote }}
+ dubbo: zookeeper
diff --git a/operator/pkg/component/component.go
b/operator/pkg/component/component.go
index 9edc7891..e7b73aa8 100644
--- a/operator/pkg/component/component.go
+++ b/operator/pkg/component/component.go
@@ -32,6 +32,7 @@ const (
NacosRegisterComponentName Name = "Nacos"
ZookeeperRegisterComponentName Name = "Zookeeper"
AdminComponentName Name = "Admin"
+ AdminExtraComponentName Name = "Kube-Prometheus"
)
type Component struct {
@@ -71,6 +72,11 @@ var AllComponents = []Component{
HelmSubDir: "admin",
HelmValuesTreeRoot: "admin",
},
+ {
+ UserFacingName: AdminExtraComponentName,
+ Default: true,
+ HelmSubDir: "admin/charts/kube-prometheus",
+ },
{
UserFacingName: NacosRegisterComponentName,
SpecName: "nacos",
diff --git a/operator/pkg/install/installer.go
b/operator/pkg/install/installer.go
index 9b23797b..c331fca9 100644
--- a/operator/pkg/install/installer.go
+++ b/operator/pkg/install/installer.go
@@ -256,7 +256,9 @@ var componentDependencies =
map[component.Name][]component.Name{
component.ZookeeperRegisterComponentName,
component.AdminComponentName,
},
- component.AdminComponentName: {},
+ component.AdminComponentName: {
+ component.AdminExtraComponentName,
+ },
}
func dependenciesChannels() map[component.Name]chan struct{} {
