chore(controller): add oss mount support

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -342,4 +342,85 @@ kubelet_volume_stats_capacity_bytes: [namespace, persistentvolumeclaim, job]
 kubelet_volume_stats_inodes: [namespace, persistentvolumeclaim, job]
 kubelet_volume_stats_inodes_free: [namespace, persistentvolumeclaim, job]
 kubelet_volume_stats_inodes_used: [namespace, persistentvolumeclaim, job]
-{{- end }}
+{{- end }}
+
+
+{{/* Generate controller config default secrets template */}}
+{{ define "controller.config.defaultSecretTemplate" }}
+oss:
+  data:
+    key_id: $access_key
+    access_key: $secret_key
+{{- end }}
+
+{{/* Generate controller config default volume template */}}
+{{ define "controller.config.defaultVolumeTemplate" }}
+nfs:
+  spec:
+    capacity:
+      storage: 65535Gi
+    accessModes:
+    - ReadWriteMany
+    claimRef:
+      namespace: $namespace
+      name: $volume_claim_name
+    nfs:
+      server: $server
+      path: $path
+    mountOptions:
+    - nfsvers=4.2
+oss:
+  spec:
+    capacity:
+      storage: 65535Gi
+    accessModes:
+    - ReadWriteMany
+    storageClassName: ''
+    claimRef:
+      namespace: $namespace
+      name: $volume_claim_name
+    mountOptions:
+    - allow-delete
+    - force-path-style
+    - endpoint-url $server
+    csi:
+      driver: s3.csi.aws.com
+      volumeHandle: $volume_handle
+      volumeAttributes:
+        bucketName: $bucket
+        authenticationSource: secrets
+      nodePublishSecretRef:
+        name: $secret_name
+        namespace: $namespace
+{{- end }}
+
+{{/* Generate controller config default volume claim template */}}
+{{ define "controller.config.defaultVolumeClaimTemplate" }}
+csi:
+  spec:
+    accessModes:
+    - ReadWriteMany
+    storageClassName: $storage_class
+    resources:
+      requests:
+        storage: $size
+    volumeMode: Filesystem
+nfs:
+  spec:
+    accessModes:
+    - ReadWriteMany
+    storageClassName: ''
+    resources:
+      requests:
+        storage: $size
+    volumeName: $volume_name
+oss:
+  spec:
+    accessModes:
+    - ReadWriteMany
+    storageClassName: ''
+    resources:
+      requests:
+        storage: $size
+    volumeName: $volume_name
+{{- end }}

charts/controller/templates/controller-celery-deloyment.yaml

@@ -53,3 +53,11 @@ spec:
         {{- end }}
         {{- include "controller.limits" $ | indent 8 }}
         {{- include "controller.envs" $ | indent 8 }}
+        volumeMounts:
+        - name: controller-config
+          readOnly: false
+          mountPath: /etc/controller
+      volumes:
+      - name: controller-config
+        configMap:
+          name: controller-config

charts/controller/templates/controller-clusterrole.yaml

@@ -70,6 +70,9 @@ rules:
 - apiGroups: ["apps"]
   resources: ["replicasets"]
   verbs: ["get", "list", "watch", "delete"]
+- apiGroups: [""]
+  resources: ["persistentvolumes"]
+  verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
 - apiGroups: [""]
   resources: ["persistentvolumeclaims"]
   verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]

charts/controller/templates/controller-configmap.yaml

@@ -23,3 +23,21 @@ data:
     {{- else}}
     {{- include "controller.config.defaultLimitPlans" . | fromYamlArray | toPrettyJson | nindent 4 }}
     {{- end }}
+  secret-template.json: |
+    {{- if .Values.config.secretTemplate }}
+    {{- (tpl .Values.config.secretTemplate $)  | nindent 4 }}
+    {{- else}}
+    {{- include "controller.config.defaultSecretTemplate" . | fromYaml | toPrettyJson | nindent 4 }}
+    {{- end }}
+  volume-template.json: |
+    {{- if .Values.config.volumeTemplate }}
+    {{- (tpl .Values.config.volumeTemplate $)  | nindent 4 }}
+    {{- else}}
+    {{- include "controller.config.defaultVolumeTemplate" . | fromYaml | toPrettyJson | nindent 4 }}
+    {{- end }}
+  volume-claim-template.json: |
+    {{- if .Values.config.volumeClaimTemplate }}
+    {{- (tpl .Values.config.volumeClaimTemplate $)  | nindent 4 }}
+    {{- else}}
+    {{- include "controller.config.defaultVolumeClaimTemplate" . | fromYaml | toPrettyJson | nindent 4 }}
+    {{- end }}

charts/controller/values.yaml

@@ -73,6 +73,9 @@ config:
   metrics: ""
   limitSpecs: ""
   limitPlans: ""
+  secretTemplate: ""
+  volumeTemplate: ""
+  volumeClaimTemplate: ""
 
 # Service
 service:

rootfs/api/migrations/0023_migration_k8s_alter_volume_type.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.18 on 2025-03-26 02:44
+
+from django.db import migrations, models
+from api.models.volume import Volume
+
+
+def save_volume_to_k8s(apps, schema_editor):
+    for volume in Volume.objects.all():
+        if volume.type == 'nfs':
+            volume.save_to_k8s()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0022_migration_deployed_ptypes'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='volume',
+            name='type',
+            field=models.CharField(choices=[('csi', 'container storage interface'), ('nfs', 'network file system'), ('oss', 'object storage service file')], default='csi'),
+        ),
+        migrations.RunPython(save_volume_to_k8s),
+    ]

rootfs/api/models/app.py

@@ -1175,12 +1175,8 @@ def _get_volumes_and_mounts(self, ptype, volumes):
         k8s_volumes, k8s_volume_mounts = [], []
         if volumes:
             for volume in volumes:
-                k8s_volume = {"name": volume.name}
-                if volume.type == "csi":
-                    k8s_volume.update({"persistentVolumeClaim": {"claimName": volume.name}})
-                else:
-                    k8s_volume.update(volume.parameters)
-                k8s_volumes.append(k8s_volume)
+                k8s_volumes.append(
+                    {"name": volume.name, "persistentVolumeClaim": {"claimName": volume.name}})
                 k8s_volume_mounts.append(
                     {"name": volume.name, "mountPath": volume.path.get(ptype)})
         return k8s_volumes, k8s_volume_mounts