Merge branch 'task-get-podtemplate' of https://github.com/Snehadas2005/notebooks into task-get-podtemplate

Snehadas2005 · Snehadas2005 · commit 1ee8a367e049 · 2026-05-27T22:13:26.000+05:30
diff --git a/workspaces/backend/api/workspace_details_handler_test.go b/workspaces/backend/api/workspace_details_handler_test.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2024.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package api
 
 import (
diff --git a/workspaces/backend/go.mod b/workspaces/backend/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/kubeflow/notebooks/workspaces/controller v0.0.0
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/stretchr/testify v1.9.0
 	github.com/swaggo/http-swagger/v2 v2.0.2
 	github.com/swaggo/swag v1.16.6
 	k8s.io/api v0.31.0
@@ -61,7 +60,6 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.19.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.55.0 // indirect
diff --git a/workspaces/backend/internal/models/workspaces/types_details.go b/workspaces/backend/internal/models/workspaces/types_details.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2024.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package workspaces
 
 type WorkspaceDetails struct {
diff --git a/workspaces/backend/openapi/docs.go b/workspaces/backend/openapi/docs.go
@@ -3283,50 +3283,22 @@ const docTemplate = `{
                 }
             }
         },
-        "github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailSecret": {
-            "type": "object",
-            "properties": {
-                "defaultMode": {
-                    "type": "integer"
-                },
-                "mountPath": {
-                    "type": "string"
-                },
-                "secretName": {
-                    "type": "string"
-                }
-            }
-        },
-        "github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume": {
-            "type": "object",
-            "properties": {
-                "mountPath": {
-                    "type": "string"
-                },
-                "pvcName": {
-                    "type": "string"
-                },
-                "readOnly": {
-                    "type": "boolean"
-                }
-            }
-        },
         "github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolumes": {
             "type": "object",
             "properties": {
                 "data": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume"
+                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodVolumeInfo"
                     }
                 },
                 "home": {
-                    "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume"
+                    "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodVolumeInfo"
                 },
                 "secrets": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailSecret"
+                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodSecretInfo"
                     }
                 }
             }
diff --git a/workspaces/backend/openapi/swagger.json b/workspaces/backend/openapi/swagger.json
@@ -3281,50 +3281,22 @@
                 }
             }
         },
-        "github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailSecret": {
-            "type": "object",
-            "properties": {
-                "defaultMode": {
-                    "type": "integer"
-                },
-                "mountPath": {
-                    "type": "string"
-                },
-                "secretName": {
-                    "type": "string"
-                }
-            }
-        },
-        "github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume": {
-            "type": "object",
-            "properties": {
-                "mountPath": {
-                    "type": "string"
-                },
-                "pvcName": {
-                    "type": "string"
-                },
-                "readOnly": {
-                    "type": "boolean"
-                }
-            }
-        },
         "github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolumes": {
             "type": "object",
             "properties": {
                 "data": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume"
+                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodVolumeInfo"
                     }
                 },
                 "home": {
-                    "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume"
+                    "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodVolumeInfo"
                 },
                 "secrets": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailSecret"
+                        "$ref": "#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodSecretInfo"
                     }
                 }
             }
diff --git a/workspaces/backend/openapi/swagger.yaml b/workspaces/backend/openapi/swagger.yaml
@@ -923,35 +923,17 @@ definitions:
       nodeName:
         type: string
     type: object
-  github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailSecret:
-    properties:
-      defaultMode:
-        type: integer
-      mountPath:
-        type: string
-      secretName:
-        type: string
-    type: object
-  github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume:
-    properties:
-      mountPath:
-        type: string
-      pvcName:
-        type: string
-      readOnly:
-        type: boolean
-    type: object
   github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolumes:
     properties:
       data:
         items:
-          $ref: '#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume'
+          $ref: '#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodVolumeInfo'
         type: array
       home:
-        $ref: '#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailVolume'
+        $ref: '#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodVolumeInfo'
       secrets:
         items:
-          $ref: '#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetailSecret'
+          $ref: '#/definitions/github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.PodSecretInfo'
         type: array
     type: object
   github_com_kubeflow_notebooks_workspaces_backend_internal_models_workspaces.WorkspaceDetails:
