chore(resources): remove resources support

Author: duanhongyi

charts/controller/Chart.yaml

@@ -5,7 +5,7 @@ appVersion: 1.0.0
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
-    version: ~1.1.2
+    version: ~1.1.5
 description: Drycc Workflow Controller (API).
 maintainers:
   - name: Drycc Team

charts/controller/templates/controller-clusterrole.yaml

@@ -72,12 +72,6 @@ rules:
 - apiGroups: [""]
   resources: ["persistentvolumeclaims"]
   verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
-- apiGroups: ["servicecatalog.k8s.io"]
-  resources: ["clusterserviceclasses", "serviceclasses", "clusterserviceplans", "serviceplans"]
-  verbs: ["get", "list", "watch"]
-- apiGroups: ["servicecatalog.k8s.io"]
-  resources: ["serviceinstances", "servicebindings"]
-  verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
 - apiGroups: ["gateway.networking.k8s.io"]
   resources: ["gateways", "listenersets", "httproutes", "grpcroutes", "tcproutes", "udproutes", "tlsroutes"]
   verbs: ["get", "patch", "list", "create", "update", "delete"]

charts/controller/templates/controller-cronjob-hourly.yaml

@@ -89,24 +89,6 @@ spec:
             - name: controller-config
               readOnly: false
               mountPath: /etc/controller
-          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
-            imagePullPolicy: {{.Values.pull_policy}}
-            name: drycc-controller-upload-resources-usage
-            {{- if .Values.diagnosticMode.enabled }}
-            command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
-            args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
-            {{- else }}
-            args:
-            - /bin/bash
-            - -c
-            - python -u /workspace/manage.py upload_resource_usage
-            {{- end }}
-            {{- include "controller.envs" . | indent 12 }}
-            {{- include "controller-job.envs" . | indent 12 }}
-            volumeMounts:
-            - name: controller-config
-              readOnly: false
-              mountPath: /etc/controller
           - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-upload-volume-usage

rootfs/api/admissions.py

@@ -86,51 +86,3 @@ def handle(self, request: Request) -> bool:
             )
         )
         return True
-
-
-class ServiceInstancesStatusHandler(BaseHandler):
-
-    def detect(self, request: Request) -> bool:
-        group = request.get("resource", {}).get("group", None)
-        resource = "/".join([
-            request.get("resource", {}).get("resource", None),
-            request.get("subResource", ""),
-        ])
-        if (group, resource) == ("servicecatalog.k8s.io", "serviceinstances/status"):
-            return True
-        return False
-
-    def handle(self, request: Request) -> bool:
-        app_id = request["object"]["metadata"]["namespace"]
-        name = request["object"]["metadata"]["name"]
-        status = request["object"]["status"]["lastConditionState"]
-        resource = models.resource.Resource.objects.filter(
-            app__id=app_id, name=name).first()
-        if resource and resource.status != status:
-            resource.status = status
-            resource.save(update_fields=["status"])
-        return True
-
-
-class ServicebindingsStatusHandler(BaseHandler):
-
-    def detect(self, request: Request) -> bool:
-        group = request.get("resource", {}).get("group", None)
-        resource = "/".join([
-            request.get("resource", {}).get("resource", None),
-            request.get("subResource", ""),
-        ])
-        if (group, resource) == ("servicecatalog.k8s.io", "servicebindings/status"):
-            return True
-        return False
-
-    def handle(self, request: Request) -> bool:
-        app_id = request["object"]["metadata"]["namespace"]
-        name = request["object"]["metadata"]["name"]
-        binding = request["object"]["status"]["lastConditionState"]
-        resource = models.resource.Resource.objects.filter(
-            app__id=app_id, name=name).first()
-        if resource and resource.binding != binding:
-            resource.binding = binding
-            resource.save(update_fields=["binding"])
-        return True

rootfs/api/exceptions.py

@@ -50,8 +50,6 @@ def custom_exception_handler(exc, context):
     response = exception_handler(exc, context)
     # No response means DRF couldn't handle it, output a generic 500 in a JSON format
     if response is None:
-        import traceback
-        traceback.print_exc()
         logging.exception('Uncaught Exception', exc_info=exc)
         set_rollback()
         return Response({'detail': 'Server Error'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

rootfs/api/management/commands/upload_resource_usage.py

@@ -0,0 +1,23 @@
+# Generated migration to remove Resource model after extraction to standalone service
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0031_app_uid_alter_workspace_uid'),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.DeleteModel(
+                    name='Resource',
+                ),
+            ],
+            # Keep the database table for now as a rollback safety measure.
+            # A future migration will drop the table after confirming stability.
+            database_operations=[],
+        ),
+    ]