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 33e23848 update charts and remove volume type (#693)
33e23848 is described below
commit 33e23848269522ee5b3f4fde73518f3378fdc1c2
Author: Jian Zhong <[email protected]>
AuthorDate: Mon Apr 28 13:52:53 2025 +0800
update charts and remove volume type (#693)
---
manifests/charts/admin/templates/clusterrole.yaml | 2 +-
.../charts/admin/templates/clusterrolebinding.yaml | 4 ++--
manifests/charts/admin/templates/deployment.yaml | 21 +++-----------------
manifests/charts/admin/templates/service.yaml | 6 +++---
manifests/charts/admin/values.yaml | 5 +----
.../nacos/templates/statefulset.yaml | 23 +---------------------
.../zookeeper/templates/statefulset.yaml | 23 +---------------------
7 files changed, 12 insertions(+), 72 deletions(-)
diff --git a/manifests/charts/admin/templates/clusterrole.yaml
b/manifests/charts/admin/templates/clusterrole.yaml
index e47b4019..06329053 100644
--- a/manifests/charts/admin/templates/clusterrole.yaml
+++ b/manifests/charts/admin/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- name: admin-dashboard-clusterrole
+ name: admin-clusterrole
labels:
app: admin
dubbo.io/rev: {{ default "default" | quote }}
diff --git a/manifests/charts/admin/templates/clusterrolebinding.yaml
b/manifests/charts/admin/templates/clusterrolebinding.yaml
index 20b327e6..afd6b696 100644
--- a/manifests/charts/admin/templates/clusterrolebinding.yaml
+++ b/manifests/charts/admin/templates/clusterrolebinding.yaml
@@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
- name: admin-dashboard-clusterrolebinding
+ name: admin-clusterrolebinding
labels:
app: admin
dubbo.io/rev: {{ default "default" | quote }}
@@ -16,5 +16,5 @@ subjects:
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
- name: admin-dashboard-clusterrole
+ name: admin-clusterrole
apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/deployment.yaml
b/manifests/charts/admin/templates/deployment.yaml
index 8a3f6b50..7b675b4a 100644
--- a/manifests/charts/admin/templates/deployment.yaml
+++ b/manifests/charts/admin/templates/deployment.yaml
@@ -4,7 +4,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: admin-dashboard
+ name: admin
namespace: {{ .Release.Namespace }}
labels:
app: admin
@@ -57,24 +57,9 @@ spec:
value: grafana:3000
volumeMounts:
- name: data
- mountPath: /var/lib/admin-dashboard
+ mountPath: /var/lib/admin
resources:
{{ toYaml $admin.resources | trim | indent 10 }}
volumes:
- name: data
- emptyDir: {}
-{{/* - name: data*/}}
-{{/* persistentVolumeClaim:*/}}
-{{/* claimName: admin-pvc*/}}
-{{/*---*/}}
-{{/*apiVersion: v1*/}}
-{{/*kind: PersistentVolumeClaim*/}}
-{{/*metadata:*/}}
-{{/* name: admin-pvc*/}}
-{{/*spec:*/}}
-{{/* storageClassName: rook-ceph-block*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 20Gi*/}}
\ No newline at end of file
+ emptyDir: {}
\ No newline at end of file
diff --git a/manifests/charts/admin/templates/service.yaml
b/manifests/charts/admin/templates/service.yaml
index f7be8167..dd47f610 100644
--- a/manifests/charts/admin/templates/service.yaml
+++ b/manifests/charts/admin/templates/service.yaml
@@ -19,14 +19,14 @@ spec:
port: 8888
targetPort: http
selector:
- app: admin-dashboard
+ app: admin
{{- end }}
---
{{- if $svc.enabled }}
apiVersion: v1
kind: Service
metadata:
- name: admin-dashboard-headless
+ name: admin-headless
namespace: {{ include "admin.namespace" . }}
labels:
app: admin
@@ -43,5 +43,5 @@ spec:
port: 8888
targetPort: http
selector:
- app: admin-dashboard
+ app: admin
{{- end -}}
diff --git a/manifests/charts/admin/values.yaml
b/manifests/charts/admin/values.yaml
index 66dde4e2..72b7f229 100644
--- a/manifests/charts/admin/values.yaml
+++ b/manifests/charts/admin/values.yaml
@@ -61,7 +61,4 @@ _internal_default_values_not_set:
service:
baseURL:
http://grafana:3000/d/b2e178fb-ada3-4d5e-9f54-de99e7f07662/service
prometheus: http://kube-prometheus-prometheus.svc.cluster.local:9090
- grafana: http://grafana:3000/
-
- kube-prometheus:
- enabled: false
\ No newline at end of file
+ grafana: http://grafana:3000/
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
index 5b8cc4b8..9cf5cd90 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
@@ -124,25 +124,4 @@ spec:
subPath: logs
volumes:
- name: data
- emptyDir: {}
-{{/* volumeClaimTemplates:*/}}
-{{/* - metadata:*/}}
-{{/* name: data*/}}
-{{/* spec:*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 5Gi*/}}
-{{/*---*/}}
-{{/*apiVersion: v1*/}}
-{{/*kind: PersistentVolumeClaim*/}}
-{{/*metadata:*/}}
-{{/* name: nacos-pvc*/}}
-{{/*spec:*/}}
-{{/* storageClassName: rook-ceph-block*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 20Gi*/}}
\ No newline at end of file
+ emptyDir: {}
\ No newline at end of file
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
index 265f1e2a..b94f7454 100644
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
@@ -76,25 +76,4 @@ spec:
name: zookeeper-scripts
defaultMode: 0755
- name: data
- emptyDir: {}
-{{/* volumeClaimTemplates:*/}}
-{{/* - metadata:*/}}
-{{/* name: data*/}}
-{{/* spec:*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 5Gi*/}}
-{{/*---*/}}
-{{/*apiVersion: v1*/}}
-{{/*kind: PersistentVolumeClaim*/}}
-{{/*metadata:*/}}
-{{/* name: zookeeper-pvc*/}}
-{{/*spec:*/}}
-{{/* storageClassName: rook-ceph-block*/}}
-{{/* accessModes:*/}}
-{{/* - ReadWriteOnce*/}}
-{{/* resources:*/}}
-{{/* requests:*/}}
-{{/* storage: 20Gi*/}}
\ No newline at end of file
+ emptyDir: {}
\ No newline at end of file
