This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new f179042 add storage (#963)
f179042 is described below
commit f179042d142cbb7153ecdf5f0aa8cabe822a9796
Author: mfordjody <[email protected]>
AuthorDate: Sun Feb 5 00:33:11 2023 +0800
add storage (#963)
---
deploy/{helm => charts}/dubbo-admin/.helmignore | 0
deploy/{helm => charts}/dubbo-admin/Chart.yaml | 0
deploy/{helm => charts}/dubbo-admin/README.md | 0
.../dubbo-admin/templates/NOTES.txt | 0
.../dubbo-admin/templates/_helpers.tpl | 0
.../dubbo-admin/templates/clusterrole.yaml | 0
.../dubbo-admin/templates/clusterrolebinding.yaml | 0
.../dubbo-admin/templates/deployment.yaml | 0
.../dubbo-admin/templates/hpa.yaml | 0
.../dubbo-admin/templates/ingress.yaml | 0
.../dubbo-admin/templates/role.yaml | 0
.../dubbo-admin/templates/rolebinding.yaml | 0
.../dubbo-admin/templates/secret-env.yaml | 0
.../dubbo-admin/templates/secret.yaml | 0
.../dubbo-admin/templates/serviceaccount.yaml | 0
.../dubbo-admin/templates/svc-headless.yaml | 0
.../dubbo-admin/templates/svc.yaml | 0
.../templates/tests/test-serviceaccount.yaml | 0
.../dubbo-admin/templates/tests/test.yaml | 0
deploy/{helm => charts}/dubbo-admin/values.yaml | 2 +-
deploy/kubernetes/deployment.yaml | 7 ++++++-
deploy/kubernetes/pv.yaml | 22 ++++++++++++++++++++++
deploy/kubernetes/pvc.yaml | 11 +++++++++++
deploy/kubernetes/storageclass.yaml | 6 ++++++
24 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/deploy/helm/dubbo-admin/.helmignore
b/deploy/charts/dubbo-admin/.helmignore
similarity index 100%
rename from deploy/helm/dubbo-admin/.helmignore
rename to deploy/charts/dubbo-admin/.helmignore
diff --git a/deploy/helm/dubbo-admin/Chart.yaml
b/deploy/charts/dubbo-admin/Chart.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/Chart.yaml
rename to deploy/charts/dubbo-admin/Chart.yaml
diff --git a/deploy/helm/dubbo-admin/README.md
b/deploy/charts/dubbo-admin/README.md
similarity index 100%
rename from deploy/helm/dubbo-admin/README.md
rename to deploy/charts/dubbo-admin/README.md
diff --git a/deploy/helm/dubbo-admin/templates/NOTES.txt
b/deploy/charts/dubbo-admin/templates/NOTES.txt
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/NOTES.txt
rename to deploy/charts/dubbo-admin/templates/NOTES.txt
diff --git a/deploy/helm/dubbo-admin/templates/_helpers.tpl
b/deploy/charts/dubbo-admin/templates/_helpers.tpl
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/_helpers.tpl
rename to deploy/charts/dubbo-admin/templates/_helpers.tpl
diff --git a/deploy/helm/dubbo-admin/templates/clusterrole.yaml
b/deploy/charts/dubbo-admin/templates/clusterrole.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/clusterrole.yaml
rename to deploy/charts/dubbo-admin/templates/clusterrole.yaml
diff --git a/deploy/helm/dubbo-admin/templates/clusterrolebinding.yaml
b/deploy/charts/dubbo-admin/templates/clusterrolebinding.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/clusterrolebinding.yaml
rename to deploy/charts/dubbo-admin/templates/clusterrolebinding.yaml
diff --git a/deploy/helm/dubbo-admin/templates/deployment.yaml
b/deploy/charts/dubbo-admin/templates/deployment.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/deployment.yaml
rename to deploy/charts/dubbo-admin/templates/deployment.yaml
diff --git a/deploy/helm/dubbo-admin/templates/hpa.yaml
b/deploy/charts/dubbo-admin/templates/hpa.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/hpa.yaml
rename to deploy/charts/dubbo-admin/templates/hpa.yaml
diff --git a/deploy/helm/dubbo-admin/templates/ingress.yaml
b/deploy/charts/dubbo-admin/templates/ingress.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/ingress.yaml
rename to deploy/charts/dubbo-admin/templates/ingress.yaml
diff --git a/deploy/helm/dubbo-admin/templates/role.yaml
b/deploy/charts/dubbo-admin/templates/role.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/role.yaml
rename to deploy/charts/dubbo-admin/templates/role.yaml
diff --git a/deploy/helm/dubbo-admin/templates/rolebinding.yaml
b/deploy/charts/dubbo-admin/templates/rolebinding.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/rolebinding.yaml
rename to deploy/charts/dubbo-admin/templates/rolebinding.yaml
diff --git a/deploy/helm/dubbo-admin/templates/secret-env.yaml
b/deploy/charts/dubbo-admin/templates/secret-env.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/secret-env.yaml
rename to deploy/charts/dubbo-admin/templates/secret-env.yaml
diff --git a/deploy/helm/dubbo-admin/templates/secret.yaml
b/deploy/charts/dubbo-admin/templates/secret.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/secret.yaml
rename to deploy/charts/dubbo-admin/templates/secret.yaml
diff --git a/deploy/helm/dubbo-admin/templates/serviceaccount.yaml
b/deploy/charts/dubbo-admin/templates/serviceaccount.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/serviceaccount.yaml
rename to deploy/charts/dubbo-admin/templates/serviceaccount.yaml
diff --git a/deploy/helm/dubbo-admin/templates/svc-headless.yaml
b/deploy/charts/dubbo-admin/templates/svc-headless.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/svc-headless.yaml
rename to deploy/charts/dubbo-admin/templates/svc-headless.yaml
diff --git a/deploy/helm/dubbo-admin/templates/svc.yaml
b/deploy/charts/dubbo-admin/templates/svc.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/svc.yaml
rename to deploy/charts/dubbo-admin/templates/svc.yaml
diff --git a/deploy/helm/dubbo-admin/templates/tests/test-serviceaccount.yaml
b/deploy/charts/dubbo-admin/templates/tests/test-serviceaccount.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/tests/test-serviceaccount.yaml
rename to deploy/charts/dubbo-admin/templates/tests/test-serviceaccount.yaml
diff --git a/deploy/helm/dubbo-admin/templates/tests/test.yaml
b/deploy/charts/dubbo-admin/templates/tests/test.yaml
similarity index 100%
rename from deploy/helm/dubbo-admin/templates/tests/test.yaml
rename to deploy/charts/dubbo-admin/templates/tests/test.yaml
diff --git a/deploy/helm/dubbo-admin/values.yaml
b/deploy/charts/dubbo-admin/values.yaml
similarity index 99%
rename from deploy/helm/dubbo-admin/values.yaml
rename to deploy/charts/dubbo-admin/values.yaml
index cfd80ff..5417cd8 100644
--- a/deploy/helm/dubbo-admin/values.yaml
+++ b/deploy/charts/dubbo-admin/values.yaml
@@ -1,6 +1,6 @@
global:
# To help compatibility with other charts which use global.imagePullSecrets.
- # Allow either an array of {name: pullSecret} maps (k8s-style), or an array
of strings (more common helm-style).
+ # Allow either an array of {name: pullSecret} maps (k8s-style), or an array
of strings (more common charts-style).
# Can be tempalted.
# global:
# imagePullSecrets:
diff --git a/deploy/kubernetes/deployment.yaml
b/deploy/kubernetes/deployment.yaml
index 3fea33a..0903850 100644
--- a/deploy/kubernetes/deployment.yaml
+++ b/deploy/kubernetes/deployment.yaml
@@ -25,6 +25,8 @@ spec:
volumeMounts:
- mountPath: /config
name: application-properties
+ - mountPath: /storage
+ name: dubbo-admin-storage
livenessProbe:
httpGet:
path: /
@@ -51,4 +53,7 @@ spec:
volumes:
- name: application-properties
configMap:
- name: dubbo-admin
\ No newline at end of file
+ name: dubbo-admin
+ - name: dubbo-admin-storage
+ persistentVolumeClaim:
+ claimName: dubbo-admin-pvc
\ No newline at end of file
diff --git a/deploy/kubernetes/pv.yaml b/deploy/kubernetes/pv.yaml
new file mode 100644
index 0000000..721af60
--- /dev/null
+++ b/deploy/kubernetes/pv.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+ name: dubbo-admin-pv
+spec:
+ capacity:
+ storage: 10Gi
+ volumeMode: Filesystem
+ accessModes:
+ - ReadWriteOnce
+ persistentVolumeReclaimPolicy: Retain
+ storageClassName: local
+ local:
+ path: /var/lib/dubbo-admin
+ nodeAffinity:
+ required:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: kubernetes.io/hostname
+ operator: In
+ values:
+ - master
\ No newline at end of file
diff --git a/deploy/kubernetes/pvc.yaml b/deploy/kubernetes/pvc.yaml
new file mode 100644
index 0000000..57352a5
--- /dev/null
+++ b/deploy/kubernetes/pvc.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: dubbo-admin-pvc
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 5Gi
+ storageClassName: local
\ No newline at end of file
diff --git a/deploy/kubernetes/storageclass.yaml
b/deploy/kubernetes/storageclass.yaml
new file mode 100644
index 0000000..f364d73
--- /dev/null
+++ b/deploy/kubernetes/storageclass.yaml
@@ -0,0 +1,6 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+ name: local
+provisioner: kubernetes.io/no-provisioner
+volumeBindingMode: WaitForFirstConsumer
\ No newline at end of file
