fix deploy bug

This commit is contained in:
cdllp2 2022-11-01 10:10:55 +08:00
parent 77d0789bfd
commit 3d7d6ceeca
5 changed files with 12 additions and 9 deletions

View File

@ -576,6 +576,7 @@ class CeleryConfig(object):
}
# 帮助文档地址显示在web导航栏
BUG_REPORT_URL = 'https://github.com/tencentmusic/cube-studio/issues/new'
DOCUMENTATION_URL='https://github.com/tencentmusic/cube-studio/wiki'
ROBOT_PERMISSION_ROLES=[] # 角色黑名单

View File

@ -576,6 +576,7 @@ class CeleryConfig(object):
}
# 帮助文档地址显示在web导航栏
BUG_REPORT_URL = 'https://github.com/tencentmusic/cube-studio/issues/new'
DOCUMENTATION_URL='https://github.com/tencentmusic/cube-studio/wiki'
ROBOT_PERMISSION_ROLES=[] # 角色黑名单

View File

@ -11,7 +11,7 @@ spec:
- hosts:
- '*'
port:
number: 80 # svc服务的外部端口会对应在ingressgateway的容器内启动svc的目标端口但无法启动80和443内部端口所以要先修改svc的目标端口再创建gateway
number: 80 # svc服务的外部端口会对应在ingressgateway的容器内启动svc的目标端口但无法启动80和443内部端口所以要先修改svc的目标端口再创建gateway也会监听svc目标端口变化进行更改
protocol: HTTP # HTTP协议在第一个创建时就有端口(80端口可能受限)开启第二个会vs才启动
---
# 添加代理8080端口的gateway需要在istio-ingressgateway 的相关配置中打开8080端口

View File

@ -56,7 +56,6 @@ class Myapp(BaseMyappView):
# "link": "%s/frontend/aihub/model_market/model_all"%request.host_url.strip('/')
# },
{
"text": "",
"pic_url": '%s/static/assets/images/tip.gif'%request.host_url.strip('/'),
"link": "%s/frontend/aihub/model_market/model_all"%request.host_url.strip('/')
},
@ -66,7 +65,10 @@ class Myapp(BaseMyappView):
"link":conf.get('DOCUMENTATION_URL','https://github.com/tencentmusic/cube-studio/wiki')
},
{
"text":'',
"icon":'<svg t="1667208826607" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2544" width="64" height="64"><path d="M946.704566 523.521404c-7.757684-4.228301-17.560958-6.198166-30.852682-6.198166l-101.187587 0L814.664298 364.109742l85.525885-85.525885c6.120394-6.120394 14.257725-15.764032 14.257725-28.798906s-8.136308-22.678512-14.256702-28.797883c-7.404644-7.405667-15.780405-14.257725-26.832112-14.257725-11.050684 0-19.425422 6.852058-26.831089 14.257725l-85.525885 85.526909L302.644855 306.513976 217.118969 220.986043c-7.513114-7.513114-15.136745-14.257725-25.753547-14.257725-10.617825 0-18.240433 6.743588-25.753547 14.257725-6.898107 6.897084-14.256702 15.189957-14.256702 26.333762s7.358595 19.436678 14.256702 26.334785l85.526909 85.526909 0 156.351977-101.187587 0c-45.176922 0-48.688909 30.187533-48.688909 39.439244 0 11.543917 4.744048 38.395472 48.688909 38.395472l101.515045 0c2.040473 48.502667 13.470803 100.372012 30.578436 138.500401l-98.322329 110.534466-0.205685 0.23536c-18.582217 21.766746-18.540262 45.980217 0.109494 63.190181l0.462534 0.409322c9.954723 8.469905 15.636119 9.355065 26.227338 9.355065l0.192382 0c12.818957 0 25.266453-6.14086 35.994796-17.758456l85.244476-96.387257c26.178219 21.829168 92.261287 68.590168 177.956018 68.590168l15.349593 0L525.053294 403.815045l15.443737 0 0 466.222397 15.349593 0c74.453712 0 143.739728-43.435255 170.071444-62.098313l93.437066 92.929506c8.67559 9.286504 21.198811 14.603603 34.426067 14.603603 1.143033 0 2.199085 0.031722 3.189645 0.059352 7.123234 0.203638 16.853853 0.474814 26.76969-10.162454 9.119705-9.222035 11.04352-18.653849 11.04352-24.965601 0-15.264659-10.741645-27.739784-18.777669-35.752272l-100.250238-100.769055c18.494213-37.081547 35.811624-93.978395 38.534642-151.111626l101.558024 0c13.285584 0 23.110347-2.003634 30.91715-6.307659 11.460006-6.315846 17.770735-17.500583 17.770735-31.491225C964.538747 540.959565 958.205505 529.789155 946.704566 523.521404zM931.949514 559.579645c-2.064009 1.136893-6.531763 2.493797-16.09763 2.493797L783.964088 562.073442l0 15.349593c0 61.841463-20.957311 127.190821-40.430828 161.738661l-5.705955 10.124592 116.461455 117.062136c9.324366 9.29776 9.797134 13.340843 9.797134 14.056134 0 1.12666-1.728364 2.937912-2.258437 3.465938l-0.471744 0.49221c-0.204661 0.223081-0.37453 0.394996-0.509606 0.524956-0.781806 0.023536-2.032286-0.014326-3.00852-0.040932-1.258667-0.035816-2.602268-0.071631-4.055362-0.071631-4.716418 0-9.230222-1.850138-12.072967-4.947685L728.436424 767.144004l-10.706853 8.632611c-0.73985 0.595564-70.215178 55.93187-146.531308 62.854537L571.198264 373.115859l-76.842109 0 0 465.633996c-43.455721-3.318582-80.450287-20.041452-104.807021-34.30941-29.958312-17.547655-48.057529-35.407418-48.221258-35.5691l-11.540847-11.545964L223.844138 877.122815c-4.596691 4.940522-9.450233 7.772011-13.33368 7.772011l-0.193405 0c-1.415232 0-2.984984 0-3.824095-0.053212-0.370437-0.251733-1.067308-0.76748-2.276856-1.786693-3.01159-2.793626-7.992021-7.953136 2.558265-20.37505l111.924115-125.82573-4.726651-9.327436c-14.823614-29.252231-32.133861-85.959767-32.133861-149.507082l0-15.349593L149.951197 562.67003c-9.783831 0-14.128789-1.660826-15.847943-2.651386-1.101077-0.633427-2.140757-1.232061-2.140757-5.045923 0-3.054569 0-8.740058 17.989723-8.740058l131.886773 0L281.838993 346.465896 187.320293 251.948219c-2.122337-2.122337-3.450589-3.612271-4.27742-4.627391 0.826831-1.01512 2.155083-2.505054 4.27742-4.626367 1.76111-1.76111 3.072989-2.990101 4.045129-3.845585 0.972141 0.855484 2.284019 2.084475 4.046153 3.845585l94.517677 94.5187 483.788471 0 94.517677-94.5187c2.478448-2.477424 4.108574-3.849678 5.123694-4.604878 1.01512 0.754177 2.64627 2.12643 5.123694 4.604878 4.91494 4.913916 5.26184 7.073092 5.265934 7.073092-0.002047 0.020466-0.335644 2.177596-5.265934 7.108908l-94.517677 94.517677 0 196.628286 131.886773 0c9.636474 0 14.107299 1.334391 16.162098 2.453888 1.020236 0.555655 1.826602 0.995677 1.826602 4.496407C933.839561 558.537919 933.005566 558.997384 931.949514 559.579645z" p-id="2545"></path><path d="M714.75789 253.198699c0-48.649-18.896372-94.337575-53.207829-128.649032-34.311457-34.31248-80.001055-53.208852-128.650055-53.208852-48.649 0-94.336552 18.896372-128.649032 53.208852-34.311457 34.311457-53.207829 80.000032-53.207829 128.649032l0 15.349593 363.714745 0L714.75789 253.198699zM382.51595 237.849106c7.713682-76.169797 72.214718-135.809105 150.384056-135.809105s142.671397 59.639309 150.385079 135.809105L382.51595 237.849106z" p-id="2546"></path></svg>',
"link":conf.get('BUG_REPORT_URL',"https://github.com/tencentmusic/cube-studio/issues/new")
},
{
"icon":'<svg t="1663658292626" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2369" width="64" height="64"><path d="M511.6 76.3C264.3 76.2 64 276.4 64 523.5 64 718.9 189.3 885 363.8 946c23.5 5.9 19.9-10.8 19.9-22.2v-77.5c-135.7 15.9-141.2-73.9-150.3-88.9C215 726 171.5 718 184.5 703c30.9-15.9 62.4 4 98.9 57.9 26.4 39.1 77.9 32.5 104 26 5.7-23.5 17.9-44.5 34.7-60.8-140.6-25.2-199.2-111-199.2-213 0-49.5 16.3-95 48.3-131.7-20.4-60.5 1.9-112.3 4.9-120 58.1-5.2 118.5 41.6 123.2 45.3 33-8.9 70.7-13.6 112.9-13.6 42.4 0 80.2 4.9 113.5 13.9 11.3-8.6 67.3-48.8 121.3-43.9 2.9 7.7 24.7 58.3 5.5 118 32.4 36.8 48.9 82.7 48.9 132.3 0 102.2-59 188.1-200 212.9 23.5 23.2 38.1 55.4 38.1 91v112.5c0.8 9 0 17.9 15 17.9 177.1-59.7 304.6-227 304.6-424.1 0-247.2-200.4-447.3-447.5-447.3z" p-id="2370" fill="#3273f1"></path></svg>',
"link":"https://github.com/tencentmusic/cube-studio"
}
@ -828,10 +830,10 @@ class Myapp(BaseMyappView):
org = nodes[ip]['labels'].get('org', 'public')
enable_train = nodes[ip]['labels'].get('train', 'true')
if g.user.is_admin():
if enable_train == 'true':
ip_html = '<a href="%s">%s</a>' % ("/myapp/schedule/node/%s" % ip, ip)
else:
ip_html = '<a href="%s"><strike>%s</strike></a>' % (cluster_config.get('K8S_DASHBOARD_CLUSTER', '').strip('/')+'/#/node/%s?namespace=default' % ip, ip)
# if enable_train == 'true':
# ip_html = '<a href="%s">%s</a>' % ("/myapp/schedule/node/%s" % ip, ip)
# else:
ip_html = '<a href="%s"><strike>%s</strike></a>' % (cluster_config.get('K8S_DASHBOARD_CLUSTER', '').strip('/')+'/#/node/%s?namespace=default' % ip, ip)
else:
if enable_train == 'true':
ip_html = ip

View File

@ -18,8 +18,7 @@ from wtforms.validators import DataRequired, Length, Regexp
from wtforms import SelectField, StringField
from flask_appbuilder.fieldwidgets import BS3TextFieldWidget, Select2ManyWidget,Select2Widget
from myapp.forms import MyBS3TextAreaFieldWidget,MySelect2Widget, MyBS3TextFieldWidget,MySelectMultipleField
from myapp.views.view_team import Project_Join_Filter
from myapp.views.view_team import filter_join_org_project
from myapp.views.view_team import Project_Join_Filter,filter_join_org_project
from flask import (
flash,
g,