From cda89ea24309033bd65e1b8d592a4fdb0a35a9db Mon Sep 17 00:00:00 2001 From: pierregeeraert Date: Fri, 19 Jun 2026 16:41:13 +0100 Subject: [PATCH] add deploy import --- django_code/apps/cloudmanager/admin.py | 2 +- django_code/apps/cloudmanager/utils.py | 13 +++++++++++++ django_code/apps/cloudmanager/views.py | 7 ------- django_code/apps/kubernetes_connection/utils.py | 16 +++++++++++++++- 4 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 django_code/apps/cloudmanager/utils.py diff --git a/django_code/apps/cloudmanager/admin.py b/django_code/apps/cloudmanager/admin.py index a19a0b4..2282d50 100644 --- a/django_code/apps/cloudmanager/admin.py +++ b/django_code/apps/cloudmanager/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin,messages from django.utils.translation import ngettext from .models import Deployment_Data,Schedule_Day_Data,Schedule_Week_Data,Namespace_Data,namespace_cmm_data_object -from .views import import_namespace +from .utils import import_namespace from apps.kubernetes_connection.utils import scale_up,scale_down DB = 'cloudmanager_db' diff --git a/django_code/apps/cloudmanager/utils.py b/django_code/apps/cloudmanager/utils.py new file mode 100644 index 0000000..6bc6b56 --- /dev/null +++ b/django_code/apps/cloudmanager/utils.py @@ -0,0 +1,13 @@ +from apps.kubernetes_connection.utils import get_namespace + + +def import_namespace(queryset): + namespaces_list = get_namespace() + for namespace in namespaces_list: + queryset.create(namespace=namespace) + +def import_deployment(queryset): + namespaces_list = get_namespace() + #for namespace in namespaces_list: + # queryset.create(namespace=namespace) + \ No newline at end of file diff --git a/django_code/apps/cloudmanager/views.py b/django_code/apps/cloudmanager/views.py index f51a930..37c8efe 100644 --- a/django_code/apps/cloudmanager/views.py +++ b/django_code/apps/cloudmanager/views.py @@ -2,8 +2,6 @@ from django.http import HttpResponse # IMPORT AT THE TOP HERE: This is completely safe! from apps.cloudmanager.models import Deployment_Data,Schedule_Week_Data -from apps.kubernetes_connection.utils import get_namespace -from .models import namespace_cmm_data_object def coucou(request): # 1. Prepare the data inside the function @@ -25,8 +23,3 @@ def display(request): print(data[0].namespace) return HttpResponse(data) -def import_namespace(queryset): - namespaces_list = get_namespace() - for namespace in namespaces_list: - queryset.create(namespace=namespace) - \ No newline at end of file diff --git a/django_code/apps/kubernetes_connection/utils.py b/django_code/apps/kubernetes_connection/utils.py index 865b941..7dd6585 100644 --- a/django_code/apps/kubernetes_connection/utils.py +++ b/django_code/apps/kubernetes_connection/utils.py @@ -37,7 +37,21 @@ def get_namespace(): core = client.CoreV1Api() namespace = core.list_namespace() namespace_list = [] - for i in range(1,len(namespace.items)): + for i in range(0,len(namespace.items)): print(namespace.items[i].metadata.name) namespace_list.append(namespace.items[i].metadata.name) return namespace_list + +def get_deployments(): + config.load_kube_config(config_file='/kubeconfig/config') + api = client.AppsV1Api() + namespaces_list = get_namespace() + deployments_list = [] + for namespace in namespaces_list: + print(namespace) + deployments = api.list_namespaced_deployment(namespace) + for deployment_index in range(0,len(deployments.items)): + deployment = deployments.items[deployment_index].metadata.name + print(" "+str(deployment)) + deployments_list.append([namespace,deployment]) + return deployments_list \ No newline at end of file