From 89959e964d972c7c3d515cefb90f5994751a0daf Mon Sep 17 00:00:00 2001 From: pengluan Date: Sun, 5 Jun 2022 20:38:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sealos=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/kubernetes/kubeflow/v1.2.0/readme.md | 6 ++++++ myapp/tools/watch_experiments.py | 2 +- myapp/tools/watch_pytorchjob.py | 2 +- myapp/tools/watch_tfjob.py | 2 +- myapp/tools/watch_workflow.py | 2 +- myapp/views/home.py | 2 +- myapp/views/view_docker.py | 6 +++--- myapp/views/view_workflow.py | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/install/kubernetes/kubeflow/v1.2.0/readme.md b/install/kubernetes/kubeflow/v1.2.0/readme.md index e84334fa..7f0448d3 100644 --- a/install/kubernetes/kubeflow/v1.2.0/readme.md +++ b/install/kubernetes/kubeflow/v1.2.0/readme.md @@ -36,6 +36,12 @@ services: ``` +sealos部署的k8s修改kube-api启动参数 +``` +--service-account-issuer=kubernetes.default.svc +--service-account-signing-key-file=/etc/kubernetes/pki/sa.key +``` + tke联系腾讯云添加 ```bash kube-api: diff --git a/myapp/tools/watch_experiments.py b/myapp/tools/watch_experiments.py index 50d13d6b..40be5927 100644 --- a/myapp/tools/watch_experiments.py +++ b/myapp/tools/watch_experiments.py @@ -28,7 +28,7 @@ if not cluster: else: clusters = conf.get('CLUSTERS',{}) if clusters and cluster in clusters: - kubeconfig = clusters[cluster]['KUBECONFIG'] + kubeconfig = clusters[cluster].get('KUBECONFIG','') k8s_config.kube_config.load_kube_config(config_file=kubeconfig) else: print('no kubeconfig in cluster %s' % cluster) diff --git a/myapp/tools/watch_pytorchjob.py b/myapp/tools/watch_pytorchjob.py index 24ae9c1f..3c5140af 100644 --- a/myapp/tools/watch_pytorchjob.py +++ b/myapp/tools/watch_pytorchjob.py @@ -36,7 +36,7 @@ if not cluster: else: clusters = conf.get('CLUSTERS',{}) if clusters and cluster in clusters: - kubeconfig = clusters[cluster]['KUBECONFIG'] + kubeconfig = clusters[cluster].get('KUBECONFIG','') k8s_config.kube_config.load_kube_config(config_file=kubeconfig) else: print('no kubeconfig in cluster %s' % cluster) diff --git a/myapp/tools/watch_tfjob.py b/myapp/tools/watch_tfjob.py index 4a5ef645..f8e33c7f 100644 --- a/myapp/tools/watch_tfjob.py +++ b/myapp/tools/watch_tfjob.py @@ -36,7 +36,7 @@ if not cluster: else: clusters = conf.get('CLUSTERS',{}) if clusters and cluster in clusters: - kubeconfig = clusters[cluster]['KUBECONFIG'] + kubeconfig = clusters[cluster].get('KUBECONFIG','') k8s_config.kube_config.load_kube_config(config_file=kubeconfig) else: print('no kubeconfig in cluster %s' % cluster) diff --git a/myapp/tools/watch_workflow.py b/myapp/tools/watch_workflow.py index 7e8a0950..f171622e 100644 --- a/myapp/tools/watch_workflow.py +++ b/myapp/tools/watch_workflow.py @@ -33,7 +33,7 @@ if not cluster: else: clusters = conf.get('CLUSTERS',{}) if clusters and cluster in clusters: - kubeconfig = clusters[cluster]['KUBECONFIG'] + kubeconfig = clusters[cluster].get('KUBECONFIG','') k8s_config.kube_config.load_kube_config(config_file=kubeconfig) else: print('no kubeconfig in cluster %s' % cluster) diff --git a/myapp/views/home.py b/myapp/views/home.py index 75888a06..f3d960c7 100644 --- a/myapp/views/home.py +++ b/myapp/views/home.py @@ -59,7 +59,7 @@ class Myapp(BaseMyappView): from myapp.utils.py.py_k8s import K8s all_clusters = conf.get('CLUSTERS',{}) if cluster_name in all_clusters: - kubeconfig = all_clusters[cluster_name]['KUBECONFIG'] + kubeconfig = all_clusters[cluster_name].get('KUBECONFIG','') pod_url = all_clusters[cluster_name].get('K8S_DASHBOARD_CLUSTER') + "#/log/%s/%s/pod?namespace=%s&container=%s" % (namespace, pod_name, namespace, pod_name) else: kubeconfig = None diff --git a/myapp/views/view_docker.py b/myapp/views/view_docker.py index 859186f7..d1009d94 100644 --- a/myapp/views/view_docker.py +++ b/myapp/views/view_docker.py @@ -152,7 +152,7 @@ class Docker_ModelView_Base(): def debug(self,docker_id): docker = db.session.query(Docker).filter_by(id=docker_id).first() from myapp.utils.py.py_k8s import K8s - k8s_client = K8s(conf.get('CLUSTERS').get(conf.get('ENVIRONMENT')).get('KUBECONFIG')) + k8s_client = K8s(conf.get('CLUSTERS').get(conf.get('ENVIRONMENT')).get('KUBECONFIG','')) namespace = conf.get('NOTEBOOK_NAMESPACE') pod_name="docker-%s-%s"%(docker.created_by.username,str(docker.id)) pod = k8s_client.get_pods(namespace=namespace,pod_name=pod_name) @@ -218,7 +218,7 @@ class Docker_ModelView_Base(): def delete_pod(self,docker_id): docker = db.session.query(Docker).filter_by(id=docker_id).first() from myapp.utils.py.py_k8s import K8s - k8s_client = K8s(conf.get('CLUSTERS').get(conf.get('ENVIRONMENT')).get('KUBECONFIG')) + k8s_client = K8s(conf.get('CLUSTERS').get(conf.get('ENVIRONMENT')).get('KUBECONFIG','')) namespace = conf.get('NOTEBOOK_NAMESPACE') pod_name="docker-%s-%s"%(docker.created_by.username,str(docker.id)) k8s_client.delete_pods(namespace=namespace,pod_name=pod_name) @@ -256,7 +256,7 @@ class Docker_ModelView_Base(): def save(self,docker_id): docker = db.session.query(Docker).filter_by(id=docker_id).first() from myapp.utils.py.py_k8s import K8s - k8s_client = K8s(conf.get('CLUSTERS').get(conf.get('ENVIRONMENT')).get('KUBECONFIG')) + k8s_client = K8s(conf.get('CLUSTERS').get(conf.get('ENVIRONMENT')).get('KUBECONFIG','')) namespace = conf.get('NOTEBOOK_NAMESPACE') pod_name="docker-%s-%s"%(docker.created_by.username,str(docker.id)) pod = k8s_client.v1.read_namespaced_pod(name=pod_name, namespace=namespace) diff --git a/myapp/views/view_workflow.py b/myapp/views/view_workflow.py index 8f5c18e9..1fec2834 100644 --- a/myapp/views/view_workflow.py +++ b/myapp/views/view_workflow.py @@ -138,7 +138,7 @@ class Crd_ModelView_Base(): if 'pipeline-id' in labels: pipeline = db.session.query(Pipeline).filter_by(id=int(labels['pipeline-id'])).first() if pipeline: - kubeconfig=pipeline.project.cluster['KUBECONFIG'] + kubeconfig=pipeline.project.cluster.get('KUBECONFIG','') k8s_client = py_k8s.K8s(kubeconfig) crd_info = conf.get("CRD_INFO", {}).get(self.crd_name, {})