feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 (TencentBlueKing#1079)

* feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074 * feat: 容器化部署设置nfs挂载参数 TencentBlueKing#1074
lannoy0523 · Aug 31, 2023 · 7f0affa · 7f0affa
1 parent 6f74dd1
commit 7f0affa
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 30 deletions.
diff --git a/support-files/kubernetes/charts/bkrepo/templates/docker/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/docker/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/fs-server/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/fs-server/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/generic/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/generic/deployment.yaml
@@ -124,9 +124,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/helm/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/helm/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/job/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/job/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/npm/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/npm/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/opdata/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/opdata/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/pv-nfs.yaml b/support-files/kubernetes/charts/bkrepo/templates/pv-nfs.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.common.config.storage.nfs.enabled -}}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ include "common.names.fullname" . }}-nfs-pv
+spec:
+  storageClassName: bkrepo-nfs
+  capacity:
+    storage: {{ .Values.common.config.storage.nfs.capacity }}
+  accessModes:
+    - ReadWriteMany
+  mountOptions:
+    - lookupcache=pos
+  nfs:
+    server: {{ .Values.common.config.storage.nfs.server }}
+    path: {{ .Values.common.config.storage.nfs.path }}
+{{- end -}}
+
diff --git a/support-files/kubernetes/charts/bkrepo/templates/pvc-nfs.yaml b/support-files/kubernetes/charts/bkrepo/templates/pvc-nfs.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.common.config.storage.nfs.enabled -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "common.names.fullname" . }}-nfs-pvc
+spec:
+  storageClassName: bkrepo-nfs
+  resources:
+    requests:
+      storage: {{ .Values.common.config.storage.nfs.capacity }}
+  accessModes:
+    - ReadWriteMany
+  volumeName: {{ include "common.names.fullname" . }}-nfs-pv
+{{- end -}}
diff --git a/support-files/kubernetes/charts/bkrepo/templates/pypi/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/pypi/deployment.yaml
@@ -100,9 +100,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/replication/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/replication/deployment.yaml
@@ -103,9 +103,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/templates/repository/deployment.yaml b/support-files/kubernetes/charts/bkrepo/templates/repository/deployment.yaml
@@ -115,9 +115,8 @@ spec:
       volumes:
         - name: storage
           {{- if .Values.common.config.storage.nfs.enabled }}
-          nfs:
-            path: {{ .Values.common.config.storage.nfs.path }}
-            server: {{ .Values.common.config.storage.nfs.server }}
+          persistentVolumeClaim:
+            claimName: {{ include "common.names.fullname" . }}-nfs-pvc
           {{- else if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "common.names.fullname" . }}-storage{{- end }}

diff --git a/support-files/kubernetes/charts/bkrepo/values.yaml b/support-files/kubernetes/charts/bkrepo/values.yaml
@@ -212,6 +212,7 @@ common:
       # 是否启用nfs挂载
       nfs:
         enabled: false
+        capacity: 100Ti
         path: /
         server:
-Original file line number
+Diff line change
@@ Expand Up / @@ -212,6 +212,7 @@ common: @@
           # 是否启用nfs挂载
           nfs:
             enabled: false
+            capacity: 100Ti
             path: /
             server:
@@ Expand Down @@