Remove V2 stuff for release, fix syntax in help_links default values

templates/config.yaml

@@ -4,13 +4,6 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 data:
-  frontend.json: |
-    {{ .Values.frontend | toJson }}
-  backend.json: |
-    {{ .Values.backend | toJson }}
-
-
-  ### DEPRECATED: 
 
   # Enable TLS (HTTPS)?
   workbench.tls.enable: "true"

values.yaml

@@ -2,131 +2,18 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-# V2
-frontend:
-  domain: "workbench.ndslabs.org"
-  subdomain_prefix: "www"
-  support_email: ""
-  analytics_tracking_id: ""
-  signin_url: "https://www.workbench.ndslabs.org/oauth2/start?rd=https%3A%2F%2Fwww.workbench.ndslabs.org%2Fmy-apps"
-  customization:
-    product_name: "Workbench"
-    landing_html: "<span style='font-size:20pt;'><p>Labs Workbench is an environment where developers can prototype tools and capabilities</p><p>that help build out the NDS framework and services. In particular, it is a place that can</p><p>host the development activities of <a style='text-decoration:none;' href='http://www.nationaldataservice.org/projects/pilots.html'>NDS pilot projects</a></p></span>"
-    favicon_path: "/favicon.svg"
-    brand_logo_path: "/favicon.svg"
-    learn_more_url: "http://www.nationaldataservice.org/platform/workbench.html"
-    help_links:
-      - icon": "fa-info-circle",
-        name": "Feature Overview",
-        url": "https://nationaldataservice.atlassian.net/wiki/display/NDSC/Feature+Overview"
-      - icon": "fa-question-circle",
-        name": "FAQ",
-        url": "https://nationaldataservice.atlassian.net/wiki/display/NDSC/Frequently+Asked+Questions"
-      - icon": "fa-book",
-        name": "User's Guide",
-        url": "https://nationaldataservice.atlassian.net/wiki/display/NDSC/User%27s+Guide"
-      - icon": "fa-code-fork",
-        name": "Developer's Guide",
-        url": "https://nationaldataservice.atlassian.net/wiki/display/NDSC/Developer%27s+Guide"
-      - icon": "fa-gavel",
-        name": "Acceptable Use Policy",
-        url": "https://nationaldataservice.atlassian.net/wiki/display/NDSC/Acceptable+Use+Policy"
-
-backend:
-  timeout: 30
-  inactivity_timeout: 480
-  specs:
-    repo: "https://github.com/nds-org/ndslabs-specs.git"
-    branch: master
-  storage:
-    home:
-      storage_class: "nfs-condo"
-      claim_suffix: "-home"
-    shared:
-      enabled: false
-      volume_path: "/tmp/shared"
-      storage_class: "nfs-condo"
-      read_only: true
-  smtp:
-    # Specify host/port to use standalone SMTP
-    host: # smtp.your.edu
-    port: # 25
-    # Specify user/pass to use Gmail SMTP
-    gmail_user: 
-    gmail_pass: 
-
-
-
-controller:
-  kind: Deployment
-  labels:
-    app: workbench
-  images:
-    etcd: "quay.io/coreos/etcd:v3.3"
-    webui: "ndslabs/angular-ui:1.3.0"
-    apiserver: "ndslabs/apiserver:1.3.0"
-  strategy_type: "RollingUpdate"
-
-ingress:
-  tls:
-    enabled: true
-    hosts:
-      - "*.workbench.ndslabs.org"
-      - "www.workbench.ndslabs.org"
-    secretName: "ndslabs-tls"
-  root:
-    annotations:
-      cluster_issuer: "acmedns-issuer"
-      issuer: ""
-  workbench:
-    annotations: {}
-
-
-  userapps:
-    annotations:
-      # kubernetes.io/ingress.class: "traefik"
-      signin_url: "https://www.workbench.ndslabs.org/oauth2/start?rd=https%3A%2F%2Fwww.workbench.ndslabs.org%2Fmy-apps"
-      auth_url: "https://www.workbench.ndslabs.org/oauth2/auth"
-      auth_response_headers: "x-auth-request-user, x-auth-request-email, x-auth-request-access-token, x-auth-request-redirect, x-auth-request-preferred-username"
-
-
-### TODO
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-
-
-#### V1
 
 
 workbench:
   dev:
     enabled: false
     uisrc: ""
   name: "Labs Workbench"
-  landing_html: | 
-    <p>Labs Workbench is an environment where developers can prototype tools and capabilities that help build out the NDS framework and services.</p>
-    <p>In particular, it is a place that can host the development activities of <a href='http://www.nationaldataservice.org/projects/pilots.html'>NDS pilot projects.</a></p>
+  landing_html: "<p>Labs Workbench is an environment where developers can prototype tools and capabilities that help build out the NDS framework and services.</p><p>In particular, it is a place that can host the development activities of <a href='http://www.nationaldataservice.org/projects/pilots.html'>NDS pilot projects.</a></p>"
   brand_logo_path: "../asset/png/favicon-32x32.png"
   favicon_path: "../asset/png/favicon-16x16.png"
   learn_more_url: "http://www.nationaldataservice.org/platform/workbench.html"
-  help_links: "[{ \"name\": \"Feature Overview\", \"icon\": \"fa-info-circle\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Feature+Overview\" },{ \"name\": \"F.A.Q.\", \"icon\": \"fa-question-circle\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Frequently+Asked+Questions\"}, { \"name\": \"User's Guide\",           icon: \"fa-book\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/User%27s+Guide\" }, { \"name\": \"Developer's Guide\", \"icon\": \"fa-code-fork\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Developer%27s+Guide\" },{ \"name\": \"Acceptable Use Policy\",  \"icon\": \"fa-gavel\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Acceptable+Use+Policy\" }]"
+  help_links: "[{ \"name\": \"Feature Overview\", \"icon\": \"fa-info-circle\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Feature+Overview\" },{ \"name\": \"F.A.Q.\", \"icon\": \"fa-question-circle\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Frequently+Asked+Questions\"}, { \"name\": \"User's Guide\", \"icon\": \"fa-book\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/User%27s+Guide\" }, { \"name\": \"Developer's Guide\", \"icon\": \"fa-code-fork\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Developer%27s+Guide\" },{ \"name\": \"Acceptable Use Policy\",  \"icon\": \"fa-gavel\", \"url\": \"https://nationaldataservice.atlassian.net/wiki/display/NDSC/Acceptable+Use+Policy\" }]"
   domain: "local.ndslabs.org"
   subdomain_prefix: "www"
   volume_name: "global"