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 831d1de6 [charts] rook csi driver template (#682)
831d1de6 is described below
commit 831d1de60ee81366b886c9de02bf4529f68e69ed
Author: Jian Zhong <[email protected]>
AuthorDate: Wed Apr 16 08:28:11 2025 +0800
[charts] rook csi driver template (#682)
---
manifests/charts/base/templates/crds.yaml | 8 ++--
manifests/charts/base/templates/rook-jobs.yaml | 59 +++++++++++++-------------
manifests/charts/base/values.yaml | 58 ++++++++++++-------------
3 files changed, 62 insertions(+), 63 deletions(-)
diff --git a/manifests/charts/base/templates/crds.yaml
b/manifests/charts/base/templates/crds.yaml
index e52c03e0..fdbe00fb 100644
--- a/manifests/charts/base/templates/crds.yaml
+++ b/manifests/charts/base/templates/crds.yaml
@@ -13,9 +13,9 @@
# 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/rook-jobs.yaml
b/manifests/charts/base/templates/rook-jobs.yaml
index fb7df4da..66e2b504 100644
--- a/manifests/charts/base/templates/rook-jobs.yaml
+++ b/manifests/charts/base/templates/rook-jobs.yaml
@@ -1,3 +1,4 @@
+{{ $rook := .Values.csi }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -30,32 +31,32 @@ data:
resources:\
mon:\
limits:\
- cpu: "102m"\
- memory: "256Mi"\
+ cpu: {{ $rook.mon.limits.cpu | default "102m" | quote }}\
+ memory: {{ $rook.mon.limits.memory | default "256Mi" | quote }}\
requests:\
- cpu: "102m"\
- memory: "256Mi"\
+ cpu: {{ $rook.mon.requests.cpu | default "102m" | quote }}\
+ memory: {{ $rook.mon.requests.memory | default "256Mi" | quote }}\
mgr:\
limits:\
- cpu: "102m"\
- memory: "512Mi"\
+ cpu: {{ $rook.mgr.limits.cpu | default "102m" | quote }}\
+ memory: {{ $rook.mgr.limits.memory | default "512Mi" | quote }}\
requests:\
- cpu: "102m"\
- memory: "512Mi"\
+ cpu: {{ $rook.mgr.requests.cpu | default "102m" | quote }}\
+ memory: {{ $rook.mgr.requests.memory | default "512Mi" | quote }}\
mds:\
limits:\
- cpu: "102m"\
- memory: "256Mi"\
+ cpu: {{ $rook.mds.limits.cpu | default "102m" | quote }}\
+ memory: {{ $rook.mds.limits.memory | default "256Mi" | quote }}\
requests:\
- cpu: "102m"\
- memory: "256Mi"\
+ cpu: {{ $rook.mds.requests.cpu | default "102m" | quote }}\
+ memory: {{ $rook.mds.requests.memory | default "256Mi" | quote }}\
osd:\
limits:\
- cpu: "512m"\
- memory: "2048Mi"\
+ cpu: {{ $rook.osd.limits.cpu | default "512m" | quote }}\
+ memory: {{ $rook.osd.limits.memory | default "2048Mi" | quote }}\
requests:\
- cpu: "512m"\
- memory: "2048Mi"
+ cpu: {{ $rook.osd.requests.cpu | default "512m" | quote }}\
+ memory: {{ $rook.osd.requests.memory | default "2048Mi" | quote }}
}' cluster.yaml
sed -i 's/^ # placement:/ placement:/' cluster.yaml
@@ -104,18 +105,18 @@ data:
sed -i '/nodes:/,/^[^ ]/ {
/nodes:/c\
nodes:\
- - name: "osp"\
+ - name: {{ $rook.nodes.name | quote }}\
devices: # specific devices to use for storage can be specified for
each node\
- - name: "nvme0n2"\
+ - name: {{ $rook.nodes.devices.name | quote }}\
config:\
- storeType: bluestore\
- journalSizeMB: "4096"
+ storeType: {{ $rook.nodes.devices.storeType }}\
+ journalSizeMB: {{ $rook.nodes.devices.journalSizeMB | default
"4096" | quote }}
}' cluster.yaml
- kubectl label node osp ceph-mon=enabled
- kubectl label node osp ceph-mgr=enabled
- kubectl label node osp ceph-mds=enabled
- kubectl label node osp ceph-osd=enabled
+ kubectl label node {{ $rook.labelSelector.node }} ceph-mon=enabled
+ kubectl label node {{ $rook.labelSelector.node }} ceph-mgr=enabled
+ kubectl label node {{ $rook.labelSelector.node }} ceph-mds=enabled
+ kubectl label node {{ $rook.labelSelector.node }} ceph-osd=enabled
kubectl apply -f crds.yaml -f common.yaml -f operator.yaml
kubectl apply -f cluster.yaml -f toolbox.yaml -f
dashboard-external-https.yaml
@@ -125,11 +126,11 @@ data:
/resources:/c\
resources:\
limits:\
- cpu: "256m"\
- memory: "512Mi"\
+ cpu: {{ $rook.cephfs.limits.cpu | default "256m" | quote}}\
+ memory: {{ $rook.cephfs.limits.memory | default "512Mi" | quote }}\
requests:\
- cpu: "256m"\
- memory: "512Mi"
+ 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
@@ -225,7 +226,7 @@ rules:
resources: ["serviceaccounts"]
verbs: ["*"]
- apiGroups: ["ceph.rook.io"]
- resources:
["cephclusters","cephfilesystemsubvolumegroups","cephfilesystems"]
+ resources:
["cephclusters","cephfilesystemsubvolumegroups","cephfilesystems","cephblockpools"]
verbs: ["*"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses"]
diff --git a/manifests/charts/base/values.yaml
b/manifests/charts/base/values.yaml
index aad7acf8..bd384104 100644
--- a/manifests/charts/base/values.yaml
+++ b/manifests/charts/base/values.yaml
@@ -17,51 +17,49 @@ _internal_default_values_not_set:
global: {}
base: {}
- rook:
+ csi:
labelSelector:
node: ""
mon:
limits:
- cpu: "102m"
- memory: "256Mi"
+ cpu: ""
+ memory: ""
requests:
- cpu: "102m"
- memory: "256Mi"
+ cpu: ""
+ memory: ""
mgr:
limits:
- cpu: "102m"
- memory: "512Mi"
+ cpu: ""
+ memory: ""
requests:
- cpu: "102m"
- memory: "512Mi"
+ cpu: ""
+ memory: ""
mds:
limits:
- cpu: "102m"
- memory: "256Mi"
+ cpu: ""
+ memory: ""
requests:
- cpu: "102m"
- memory: "256Mi"
+ cpu: ""
+ memory: ""
osd:
limits:
- cpu: "512m"
- memory: "2048Mi"
+ cpu: ""
+ memory: ""
requests:
- cpu: "512m"
- memory: "2048Mi"
+ cpu: ""
+ memory: ""
nodes:
- - name: "osp"
- devices:
- - name: "nvme0n2"
- config:
- storeType: bluestore
- journalSizeMB: "4096"
+ name: ""
+ devices:
+ name: ""
+ storeType: bluestore
+ journalSizeMB: ""
cephfs:
- resources:
- limits:
- cpu: "256m"
- memory: "512Mi"
- requests:
- cpu: "256m"
- memory: "512Mi"
\ No newline at end of file
+ limits:
+ cpu: ""
+ memory: ""
+ requests:
+ cpu: ""
+ memory: ""
\ No newline at end of file
