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 acb37d5a [charts] Add domain name and optimize csi configuration (#687)
acb37d5a is described below
commit acb37d5ab4d924e3f7392c8d02b1c1410725874f
Author: Jian Zhong <[email protected]>
AuthorDate: Fri Apr 18 16:00:34 2025 +0800
[charts] Add domain name and optimize csi configuration (#687)
---
manifests/charts/admin/Chart.yaml | 4 +-
manifests/charts/base/Chart.yaml | 4 +-
manifests/charts/base/templates/crds.yaml | 9 ++-
.../charts/base/templates/ingress-controller.yaml | 14 +++++
manifests/charts/base/templates/ingress.yaml | 72 ++++++++++++++++++++++
manifests/charts/base/templates/rook-jobs.yaml | 13 ++++
manifests/charts/base/values.yaml | 15 +++++
.../register-discovery/nacos/Chart.yaml | 4 +-
.../register-discovery/zookeeper/Chart.yaml | 4 +-
9 files changed, 126 insertions(+), 13 deletions(-)
diff --git a/manifests/charts/admin/Chart.yaml
b/manifests/charts/admin/Chart.yaml
index 9770a308..22a62398 100644
--- a/manifests/charts/admin/Chart.yaml
+++ b/manifests/charts/admin/Chart.yaml
@@ -19,8 +19,8 @@ annotations:
name: admin
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for dubbo admin dashboard.
-version: 0.0.0
-appVersion: 0.0.0
+version: 1.0.0
+appVersion: 1.0.0
maintainers:
- name: mfordjody
email: [email protected]
diff --git a/manifests/charts/base/Chart.yaml b/manifests/charts/base/Chart.yaml
index 8e77cea9..3bb87882 100644
--- a/manifests/charts/base/Chart.yaml
+++ b/manifests/charts/base/Chart.yaml
@@ -19,8 +19,8 @@ annotations:
name: base
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for deploying dubbo cluster resources and CRDs.
-version: 0.0.0
-appVersion: 0.0.0
+version: 1.0.0
+appVersion: 1.0.0
maintainers:
- name: mfordjody
email: [email protected]
diff --git a/manifests/charts/base/templates/crds.yaml
b/manifests/charts/base/templates/crds.yaml
index fdbe00fb..bc0d9ac3 100644
--- a/manifests/charts/base/templates/crds.yaml
+++ b/manifests/charts/base/templates/crds.yaml
@@ -13,9 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{/*{{- $file := .Files }}*/}}
-{{/*{{- range $path, $_ := .Files.Glob "files/**.yaml" }}*/}}
-{{/*{{- $file.Get $path }}*/}}
-{{/*{{- end -}}*/}}
-
+{{- $file := .Files }}
+{{- range $path, $_ := .Files.Glob "files/**.yaml" }}
+{{- $file.Get $path }}
+{{- end -}}
diff --git a/manifests/charts/base/templates/ingress-controller.yaml
b/manifests/charts/base/templates/ingress-controller.yaml
index 4876ed5e..43537454 100644
--- a/manifests/charts/base/templates/ingress-controller.yaml
+++ b/manifests/charts/base/templates/ingress-controller.yaml
@@ -69,3 +69,17 @@ metadata:
name: dubbo
spec:
controller: "dubbo.io/dubbo-kubernetes-ingress-controller"
+---
+{{ $ingress := .Values.ingress }}
+{{- $ca := genCA "dubbo-kubernetes-ca" 365 }}
+{{- $cert := genSignedCert $ingress.hosts.admin nil (list $ingress.hosts.admin
$ingress.hosts.prometheus $ingress.hosts.grafana) 365 $ca }}
+apiVersion: v1
+kind: Secret
+metadata:
+ name: dubbo-kubernetes-ingress-tls
+ namespace: {{ .Release.Namespace }}
+type: kubernetes.io/tls
+data:
+ tls.crt: {{ $cert.Cert | b64enc | quote }}
+ tls.key: {{ $cert.Key | b64enc | quote }}
+ ca.crt: {{ $ca.Cert | b64enc | quote }}
diff --git a/manifests/charts/base/templates/ingress.yaml
b/manifests/charts/base/templates/ingress.yaml
new file mode 100644
index 00000000..d7971c57
--- /dev/null
+++ b/manifests/charts/base/templates/ingress.yaml
@@ -0,0 +1,72 @@
+{{ $ingress := .Values.ingress }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: admin-dashboard
+ annotations:
+ nginx.ingress.kubernetes.io/ssl-redirect: "true"
+spec:
+ tls:
+ - hosts:
+ - {{ $ingress.hosts.admin }}
+ secretName: dubbo-kubernetes-ingress-tls
+ ingressClassName: {{ $ingress.class |default "dubbo" }}
+ rules:
+ - host: {{ $ingress.hosts.admin | default "dubbo" }}
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: admin-dashboard
+ port:
+ number: 8080
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: kube-prometheus-prometheus
+ annotations:
+ nginx.ingress.kubernetes.io/ssl-redirect: "true"
+spec:
+ tls:
+ - hosts:
+ - {{ $ingress.hosts.prometheus }}
+ secretName: dubbo-kubernetes-ingress-tls
+ ingressClassName: {{ $ingress.class | default "dubbo" }}
+ rules:
+ - host: {{ $ingress.hosts.prometheus }}
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: kube-prometheus-prometheus
+ port:
+ number: 9090
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: grafana
+ annotations:
+ nginx.ingress.kubernetes.io/ssl-redirect: "true"
+spec:
+ tls:
+ - hosts:
+ - {{ $ingress.hosts.grafana }}
+ secretName: dubbo-kubernetes-ingress-tls
+ ingressClassName: {{ $ingress.class | default "dubbo" }}
+ rules:
+ - host: {{ $ingress.hosts.grafana }}
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: grafana
+ port:
+ number: 80
diff --git a/manifests/charts/base/templates/rook-jobs.yaml
b/manifests/charts/base/templates/rook-jobs.yaml
index 66e2b504..fb04bc87 100644
--- a/manifests/charts/base/templates/rook-jobs.yaml
+++ b/manifests/charts/base/templates/rook-jobs.yaml
@@ -132,6 +132,7 @@ data:
cpu: {{ $rook.cephfs.requests.cpu | default "256m" | quote }}\
memory: {{ $rook.cephfs.requests.memory | default "512Mi" | quote
}}
}' filesystem-test.yaml
+
sed -i '/podAntiAffinity:/,/- rook-ceph-mds/ s/^/ # /'
filesystem-test.yaml
sed -i '/preferredDuringSchedulingIgnoredDuringExecution:/,/-
rook-ceph-mds/ s/^/ # /' filesystem-test.yaml
sed -i '/topologyKey: kubernetes.io\/hostname/ s/^/ #/'
filesystem-test.yaml
@@ -155,6 +156,18 @@ data:
# 至少需要 1 个 osd
kubectl apply -f filesystem-test.yaml ; kubectl apply -f
csi/cephfs/storageclass.yaml
+
+ sed -i '/^spec:/a\
+ resources:\
+ limits:\
+ cpu: "256m"\
+ memory: "512Mi"\
+ requests:\
+ cpu: "256m"\
+ memory: "512Mi"
+ ' csi/rbd/storageclass-test.yaml
+
+ # 至少需要 1 个 osd
kubectl apply -f csi/rbd/storageclass-test.yaml
---
apiVersion: batch/v1
diff --git a/manifests/charts/base/values.yaml
b/manifests/charts/base/values.yaml
index bd384104..c9412705 100644
--- a/manifests/charts/base/values.yaml
+++ b/manifests/charts/base/values.yaml
@@ -17,6 +17,13 @@ _internal_default_values_not_set:
global: {}
base: {}
+ ingress:
+ class: ""
+ hosts:
+ admin: admin.dubbo.domain
+ prometheus: prom.dubbo.domain
+ grafana: grafana.dubbo.domain
+
csi:
labelSelector:
node: ""
@@ -56,6 +63,14 @@ _internal_default_values_not_set:
storeType: bluestore
journalSizeMB: ""
+ rbd:
+ limits:
+ cpu: ""
+ memory: ""
+ requests:
+ cpu: ""
+ memory: ""
+
cephfs:
limits:
cpu: ""
diff --git a/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
index 961bbf42..0a365275 100644
--- a/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/nacos/Chart.yaml
@@ -19,8 +19,8 @@ annotations:
name: nacos
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for nacos register plane.
-version: 0.0.0
-appVersion: 0.0.0
+version: 1.0.0
+appVersion: 1.0.0
maintainers:
- name: mfordjody
email: [email protected]
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
index 8b5c434b..195eb053 100644
--- a/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/zookeeper/Chart.yaml
@@ -19,8 +19,8 @@ annotations:
name: zookeeper
home: https://github.com/apache/dubbo-kubernetes
description: Helm chart for zookeeper register plane.
-version: 0.0.0
-appVersion: 0.0.0
+version: 1.0.0
+appVersion: 1.0.0
maintainers:
- name: mfordjody
email: [email protected]
