增加autodl jinjin2模板配置

autodl/cfg-autodl-admin-frontend.yaml → autodl/cfg-autodl-admin-frontend.yaml.j2

@@ -2,9 +2,9 @@ apiVersion: v1
 data:
 data:
   production-base.js: |
   production-base.js: |
     const productionHost = {
     const productionHost = {
-      API_HOST: 'autodl_admin_backend',
-      WS_HOST: 'autodl_admin_back_socket',
-      CUSTOM_SOURCE: 'custom_source',
+      API_HOST: '{{ autodl_admin_backend }}',
+      WS_HOST: '{{ autodl_admin_back_socket }}',
+      CUSTOM_SOURCE: '{{ custom_source }}',
     }
     }
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:

autodl/cfg-autodl-backend.yaml → autodl/cfg-autodl-backend.yaml.j2

@@ -13,33 +13,33 @@ data:
       monitor_port: "8920"
       monitor_port: "8920"
 
 
     redis:
     redis:
-      addr: "redis_host"
-      password: "redis_password"
+      addr: "{{ redis_host }}"
+      password: "{{ redis_password }}"
 
 
     database:
     database:
       type: "mysql"
       type: "mysql"
-      host: mysql_host
+      host: {{ mysql_host }}
       name: autocnn
       name: autocnn
-      user: mysql_user
-      password: mysql_password
+      user: {{ mysql_user }}
+      password: {{ mysql_password }}
       url: "%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local"
       url: "%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=True&loc=Local"
 
 
     GIT_ROOT: /mnt/ceph/git
     GIT_ROOT: /mnt/ceph/git
-    AUTOCNN_ES_URL: autodl_es
+    AUTOCNN_ES_URL: {{ autodl_es }}
 
 
     rpc:
     rpc:
       core: "core--server.autodl.svc.cluster.local:30100"
       core: "core--server.autodl.svc.cluster.local:30100"
 
 
     function_switch:
     function_switch:
-      private_deploy: deploy_is_private
+      private_deploy: {{ deploy_is_private }}
 
 
     url:
     url:
-      adl_backend: autodl_backend
-      adl_admin_backend: autodl_admin_backend
+      adl_backend: {{ autodl_backend }}
+      adl_admin_backend: {{ autodl_admin_backend }}
 
 
     docker:
     docker:
       # 用于加载镜像的公网 / 内网harbor仓库地址
       # 用于加载镜像的公网 / 内网harbor仓库地址
-      registry_host: hb_host
+      registry_host: {{ hb_host }}
       registry_group_name: kpl_k8s
       registry_group_name: kpl_k8s
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:

autodl/cfg-autodl-competition.yaml → autodl/cfg-autodl-competition.yaml.j2

@@ -2,7 +2,7 @@ apiVersion: v1
 data:
 data:
   setting.py: |
   setting.py: |
     NFS_ROOT = "/mnt/ceph"
     NFS_ROOT = "/mnt/ceph"
-    DB = "mysql+pymysql://mysql_user:mysql_password@mysql_host/autocnn"
+    DB = "mysql+pymysql://{{ mysql_user }}:{{ mysql_password }}@{{ mysql_host }}/autocnn"
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:
   name: cfg-autodl-competition
   name: cfg-autodl-competition

autodl/cfg-autodl-frontend.yaml → autodl/cfg-autodl-frontend.yaml.j2

@@ -2,11 +2,11 @@ apiVersion: v1
 data:
 data:
   production-base.js: |
   production-base.js: |
     const productionHost = {
     const productionHost = {
-      API_HOST: 'autodl_backend/api/v1',
-      BROWSER_HOST: 'autodl_file/api/v1',
-      WS_HOST: 'autodl_back_socket/api/v1',
-      TB_HOST: 'autodl_backend',
-      CUSTOM_SOURCE: 'custom_source',
+      API_HOST: '{{ autodl_backend }}/api/v1',
+      BROWSER_HOST: '{{ autodl_file }}/api/v1',
+      WS_HOST: '{{ autodl_back_socket }}/api/v1',
+      TB_HOST: '{{ autodl_backend }}',
+      CUSTOM_SOURCE: '{{ custom_source }}',
     }
     }
 kind: ConfigMap
 kind: ConfigMap
 metadata:
 metadata:

autodl/cfg-autodl-nginx.yaml → autodl/cfg-autodl-nginx.yaml.j2

@@ -59,7 +59,7 @@ data:
         }
         }
 
 
         location ~ /tensorboard/proxy/([-_.:\w]+)/(.*) {
         location ~ /tensorboard/proxy/([-_.:\w]+)/(.*) {
-            resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+            resolver {{ K8S_DNS_SVC }} valid=5s;
             rewrite_log on;
             rewrite_log on;
             rewrite ^/tensorboard/proxy/([-_.:\w]+)/(.*) /$2 break;
             rewrite ^/tensorboard/proxy/([-_.:\w]+)/(.*) /$2 break;
             proxy_pass http://$1;
             proxy_pass http://$1;
@@ -70,7 +70,7 @@ data:
         }
         }
 
 
          location ~ /notebook/proxy/([-_.:\w]+)/(.*) {
          location ~ /notebook/proxy/([-_.:\w]+)/(.*) {
-            resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+            resolver {{ K8S_DNS_SVC }} valid=5s;
             rewrite_log on;
             rewrite_log on;
             rewrite ^/notebook/proxy/([-_.:\w]+)/(.*) /notebook/proxy/$1/$2 break;
             rewrite ^/notebook/proxy/([-_.:\w]+)/(.*) /notebook/proxy/$1/$2 break;
             proxy_pass http://$1;
             proxy_pass http://$1;
@@ -82,7 +82,7 @@ data:
         }
         }
 
 
          location ~ /jupyterlab/proxy/([-_.:\w]+)/(.*) {
          location ~ /jupyterlab/proxy/([-_.:\w]+)/(.*) {
-                resolver kube-dns.kube-system.svc.cluster.local valid=5s;
+                resolver {{ K8S_DNS_SVC }} valid=5s;
                 rewrite_log on;
                 rewrite_log on;
                 rewrite ^/jupyterlab/proxy/([-_.:\w]+)/(.*) /jupyterlab/proxy/$1/$2 break;
                 rewrite ^/jupyterlab/proxy/([-_.:\w]+)/(.*) /jupyterlab/proxy/$1/$2 break;
                 proxy_pass http://$1.autodl.svc.cluster.local:8888;
                 proxy_pass http://$1.autodl.svc.cluster.local:8888;