Commit 9152d5d0 authored by Adrian Pino's avatar Adrian Pino Committed by GitHub
Browse files

Merge pull request #142 from SunriseOpenOperatorPlatform/hotfix/edgecloud-k8s-fix-connector-issue 

Hotfix/edgecloud k8s fix connector issue
parents 00dc109b 8a6ca1cf

src/sunrise6g_opensdk/edgecloud/adapters/kubernetes/client.py

+1 −0
Original line number Original line Diff line number Diff line
@@ -215,6 +215,7 @@ class EdgeApplicationManager(EdgeCloudManagementInterface): 
        nodes = self.k8s_connector.get_node_details()

        nodes = self.k8s_connector.get_node_details()

        node_details = None

        node_details = None

        for item in nodes.get("items"):

        for item in nodes.get("items"):

            # TODO: Fix uid stuff

            if item.get("metadata").get("uid") == zone_id:

            if item.get("metadata").get("uid") == zone_id:

                node_details = item

                node_details = item

                break

                break

src/sunrise6g_opensdk/edgecloud/adapters/kubernetes/lib/utils/kubernetes_connector.py

+14 −8
Original line number Original line Diff line number Diff line 
from __future__ import print_function

from __future__ import print_function





from urllib.parse import urlparse



import requests

import requests

import urllib3

from kubernetes import client

from kubernetes import client

from kubernetes.client.rest import ApiException

from kubernetes.client.rest import ApiException
@@ -11,20 +14,23 @@ from sunrise6g_opensdk.edgecloud.adapters.kubernetes.lib.utils.connector_db impo 
    ConnectorDB,

    ConnectorDB,

)

)





urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)



configuration = client.Configuration()

configuration = client.Configuration()









class KubernetesConnector:

class KubernetesConnector:

    def __init__(self, ip, port, token, username, namespace):

    def __init__(self, ip, port, token, username, namespace):

        master_node_ip = ip

        parsed_url = urlparse(ip)  # ip can be full URL or just IP

        master_node_port = port



        username = username

        scheme = parsed_url.scheme or "https"

        self.namespace = "default" if namespace is None else namespace

        host = parsed_url.hostname or ip

        port = port or parsed_url.port or "6443"



        self.host = f"{scheme}://{host}:{port}"

        self.namespace = namespace if namespace else "default"

        self.token_k8s = token

        self.token_k8s = token

        if port is None:



            self.host = master_node_ip

        else:

            self.host = "https://" + master_node_ip + ":" + master_node_port

        configuration.api_key["authorization"] = self.token_k8s

        configuration.api_key["authorization"] = self.token_k8s

        configuration.api_key_prefix["authorization"] = "Bearer"

        configuration.api_key_prefix["authorization"] = "Bearer"