templates: templates/kube, templates/html

app/components.js

@@ -32,7 +32,7 @@ baseRepl['commands'] = templatize(cconfig.commands.path)(baseRepl)
 
 // Given a path loads it and compiles a template for it, use loadTemplate that has caching
 function loadTemplateInternal(templatePath, next) {
-  const templateRealPath = path.join(templatesDir, templatePath || "defaultTemplate.yaml")
+  const templateRealPath = path.join(templatesDir, templatePath || "kube/defaultTemplate.yaml")
   fs.readFile(templateRealPath, 'utf8', function(err, data) {
     if (err) {
       err.message = err.message + ` loading ${templateRealPath}`
@@ -93,7 +93,7 @@ function evalTemplate(templatePath, extraRepl, next) {
 }
 
 function namespaceTemplate(name, next) {
-  evalTemplate("namespace.yaml", { namespace: name }, next)
+  evalTemplate("kube/namespace.yaml", { namespace: name }, next)
 }
 
 /// returns a short session ID from a long session id

config/default-remotevis.hjson

@@ -6,6 +6,6 @@ k8component: {
     port: 8809,
     prefix: "/jupyter",
     homePath: "/home/beaker"
-    templatePath: "remoteVisTemplate.yaml"
+    templatePath: "kube/remoteVisTemplate.yaml"
   }
 }

config/default.hjson

@@ -11,7 +11,7 @@ app: {
   frontendAddr: "http://127.0.0.1:4200"
   baseUri: "http://127.0.0.1"
   catchErrors: false
-  templatesDir: "{{baseDir}}/kubeTemplates"
+  templatesDir: "{{baseDir}}/templates"
   baseReplacements: {
     nomadRoot: "/nomad/nomadlab"
   }
@@ -49,7 +49,7 @@ k8component: {
   templateCacheNMax: 20
   templateCacheTtlMaxMs: 30000
   namespace: "analytics"
-  templatePath: "defaultTemplate.yaml"
+  templatePath: "kube/defaultTemplate.yaml"
   keysToProtect: ["keysToProtect", "keysToSkip"]
   keysToSkip: ["templateCacheTtlMaxMs", "templateCacheNMax", "keysToSkip", "keysToProtect", "images", "entryPoint", "commands"]
   image: {